updated gentoo ebuids

fixed compilation warnings

4 files changed, 9 insertions, 8 deletions

diff --git a/accel-pptpd/extra/pppd_compat.c b/accel-pptpd/extra/pppd_compat.c
index ad0da57c..f53f7123 100644
--- a/accel-pptpd/extra/pppd_compat.c
+++ b/accel-pptpd/extra/pppd_compat.c
@@ -255,7 +255,7 @@ static void write_radattr(struct ppp_t *ppp, struct rad_packet_t *pack, int save
 	struct rad_attr_t *attr;
 	struct rad_dict_value_t *val;
 	FILE *f;
-	char *fname1, *fname2;
+	char *fname1, *fname2 = NULL;
 	int i;
 
 	fname1 = _malloc(PATH_MAX);
diff --git a/accel-pptpd/radius/auth.c b/accel-pptpd/radius/auth.c
index 3be58253..2e764397 100644
--- a/accel-pptpd/radius/auth.c
+++ b/accel-pptpd/radius/auth.c
@@ -295,7 +295,7 @@ static void setup_mppe(struct rad_req_t *req, const uint8_t *challenge)
 
 int rad_auth_mschap_v1(struct radius_pd_t *rpd, const char *username, va_list args)
 {
-	int r;
+	int r = PWDB_DENIED;
 	struct rad_req_t *req;
 	uint8_t response[50];
 
@@ -340,7 +340,7 @@ out:
 
 int rad_auth_mschap_v2(struct radius_pd_t *rpd, const char *username, va_list args)
 {
-	int r;
+	int r = PWDB_DENIED;
 	struct rad_req_t *req;
 	struct rad_attr_t *ra;
 	uint8_t mschap_response[50];
diff --git a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
index 7632da83..e926e29a 100644
--- a/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
+++ b/contrib/gentoo/net-dialup/accel-pptp/accel-pptp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=2
 
-inherit git linux-mod cmake-utils
+inherit eutils git linux-mod cmake-utils
 
 EGIT_REPO_URI="git://accel-pptp.git.sourceforge.net/gitroot/accel-pptp/accel-pptp"
 
@@ -33,12 +33,13 @@ MODULESD_PPTP_ALIASES=("net-pf-24 pptp")
 PREFIX="/"
 MODULE_NAMES="pptp(extra:${S}/driver/)"
 
-src_unpack() {
+src_unpack () {
 	git_src_unpack
+}
+
+src_prepare() {
 	sed -i -e "/mkdir/d" "${S}/accel-pptpd/CMakeLists.txt"
 	sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt"
-	
-	convert_to_m ${S}/driver/Makefile
 }
 
 src_configure() {
@@ -65,6 +66,7 @@ src_compile() {
 	cmake-utils_src_compile
 	
 	cd ${S}/driver
+	#convert_to_m Makefile
 	linux-mod_src_compile || die "failed to build driver"
 }
 
diff --git a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
index d8e2ee57..f9155b4c 100755
--- a/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
+++ b/contrib/gentoo/net-dialup/accel-pptp/files/pptpd-init
@@ -6,7 +6,6 @@ depend() {
 
 start() {
 	ebegin "Starting accel-pptpd"
-	modprobe pptp
 	start-stop-daemon --start --quiet --exec /usr/sbin/accel-pptpd -- -p /var/run/pptpd.pid ${PPTPD_OPTS}
 	eend $?
 }