[PATCH 1/4] poptop: remove version 1.3.0

[PATCH 1/4] poptop: remove version 1.3.0

[Roman I Khimov]

Release dated 2005 and the recipe in unmaintained, 1.3.4 recipe is alsmost
completely different now. So, I see no point in keeping it around.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 recipes/poptop/poptop_1.3.0.bb |   35 -----------------------------------
 1 files changed, 0 insertions(+), 35 deletions(-)
 delete mode 100644 recipes/poptop/poptop_1.3.0.bb

diff --git a/recipes/poptop/poptop_1.3.0.bb b/recipes/poptop/poptop_1.3.0.bb
deleted file mode 100644
index da7ebe6..0000000
--- a/recipes/poptop/poptop_1.3.0.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Poptop is the PPTP server solution for Linux \
-Using Poptop, Linux servers can now function seamlessly in a PPTP VPN environment. \
-This enables administrators to leverage the considerable benefits of both Microsoft and Linux operating systems \
-The current release version supports Windows 95/98/Me/NT/2000/XP PPTP clients and Linux PPTP clients \
-For more info visit http://www.poptop.org/"
-
-HOMEPAGE    = "http://www.poptop.org/"
-LICENSE     = "GPL"
-SECTION = "network"
-PRIORITY    = "optional"
-DEPENDS     = "ppp"
-RDEPENDS    = "ppp"
-
-PR = "r0"
-
-inherit autotools
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz"
-S = "${WORKDIR}/pptpd-${PV}"
-
-
-
-do_install() {
-	install -d ${D}${sbindir}
-	install -d ${D}/${sysconfdir}
-	install -d ${D}/${sysconfdir}/ppp/
-
-	install -m 0755  pptpd         ${D}${sbindir}/
-	install -m 0755  pptpctrl      ${D}${sbindir}/
-	install -m 0644 samples/options.pptpd ${D}/${sysconfdir}/ppp/
-	install -m 0644 samples/pptpd.conf    ${D}/${sysconfdir}/
-
-
-}
-
-- 
1.6.4.2

[PATCH 2/4] poptop: disable logwtmp in config

[Roman I Khimov]

Poptop tries to use that and we have it removed since it's broken, no good.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 recipes/poptop/poptop_1.3.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/poptop/poptop_1.3.4.bb b/recipes/poptop/poptop_1.3.4.bb
index 370f6a3..a4508c4 100644
--- a/recipes/poptop/poptop_1.3.4.bb
+++ b/recipes/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
            file://fix-plugins-install.patch;patch=1 \
@@ -26,7 +26,9 @@ do_install_append() {
         install -d ${D}${sbindir} ${D}/${sysconfdir} ${D}/${sysconfdir}/ppp
         install -m 0644 samples/options.pptpd ${D}/${sysconfdir}/ppp/
         install -m 0644 samples/pptpd.conf ${D}/${sysconfdir}/
+
         # broken
+	sed -ri "s,^[:space:]*logwtmp[:space:]*,# logwtmp," ${D}/${sysconfdir}/pptpd.conf
         rm -f ${D}${libdir}/pptpd/pptpd-logwtmp.so
 }
 
-- 
1.6.4.2

[PATCH 3/4] poptop: change "require-mppe-128" option to plain "mppe"

[Roman I Khimov]

OE has ppp-2.4.3-mppe-mppc-1.1.patch for pppd and it disables
'require-mppe-128' option, so poptop complains:

In file /etc/ppp/options.pptpd: unrecognized option 'require-mppe-128'

on start. Fix that by using 'mppe' option.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 recipes/poptop/poptop_1.3.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/poptop/poptop_1.3.4.bb b/recipes/poptop/poptop_1.3.4.bb
index a4508c4..be1379a 100644
--- a/recipes/poptop/poptop_1.3.4.bb
+++ b/recipes/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
            file://fix-plugins-install.patch;patch=1 \
@@ -30,6 +30,8 @@ do_install_append() {
         # broken
 	sed -ri "s,^[:space:]*logwtmp[:space:]*,# logwtmp," ${D}/${sysconfdir}/pptpd.conf
         rm -f ${D}${libdir}/pptpd/pptpd-logwtmp.so
+	# Use mppe option in OE style
+	sed -ri "s,^[[:space:]]*require-mppe-128[[:space:]]*$,mppe required,no40,no56," ${D}/${sysconfdir}/ppp/options.pptpd
 }
 
 PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN} ${PN}-doc"
-- 
1.6.4.2

[PATCH 4/4] poptop: don't expose open port by default, listen on 127.0.0.1

[Roman I Khimov]

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---
 recipes/poptop/poptop_1.3.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/poptop/poptop_1.3.4.bb b/recipes/poptop/poptop_1.3.4.bb
index be1379a..8d9b60d 100644
--- a/recipes/poptop/poptop_1.3.4.bb
+++ b/recipes/poptop/poptop_1.3.4.bb
@@ -8,7 +8,7 @@ SECTION = "network"
 LICENSE = "GPL"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
            file://fix-plugins-install.patch;patch=1 \
@@ -32,6 +32,8 @@ do_install_append() {
         rm -f ${D}${libdir}/pptpd/pptpd-logwtmp.so
 	# Use mppe option in OE style
 	sed -ri "s,^[[:space:]]*require-mppe-128[[:space:]]*$,mppe required,no40,no56," ${D}/${sysconfdir}/ppp/options.pptpd
+	echo "# don't expose open port by default" >> ${D}/${sysconfdir}/pptpd.conf
+	echo "listen  127.0.0.1" >> ${D}/${sysconfdir}/pptpd.conf
 }
 
 PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN} ${PN}-doc"
-- 
1.6.4.2

Re: [PATCH 1/4] poptop: remove version 1.3.0

[Roman I Khimov]

[-- Attachment #1: Type: Text/Plain, Size: 450 bytes --]

В сообщении от Понедельник 29 марта 2010 21:31:07 автор Roman I Khimov 
написал:
> Release dated 2005 and the recipe in unmaintained, 1.3.4 recipe is alsmost
> completely different now. So, I see no point in keeping it around.

Pushed the rest of series, not removing stale version without ACKs.

-- 
 http://roman.khimov.ru
mailto: roman@khimov.ru
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 205 bytes --]