[oe-commits] org.oe.dev poptop 1.3.4: Add 1.3.4 with some changes:
lenehan commit
openembedded-commits at lists.openembedded.org
Wed Jun 13 00:06:45 UTC 2007
poptop 1.3.4: Add 1.3.4 with some changes:
* Mark config files as such
* Add an init script
* Make bcrelay and the wtmp plugin available via seperate packages
* Make the -doc package available.
Author: lenehan at openembedded.org
Branch: org.openembedded.dev
Revision: 0a38e7566051393faa3d7b2924eecdf612c4c021
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0a38e7566051393faa3d7b2924eecdf612c4c021
Files:
1
packages/poptop/poptop_1.3.0.bb
packages/poptop/poptop_1.3.4.bb
packages/poptop/files
packages/poptop/poptop-1.3.4
packages/poptop/files/pptpd.init
packages/poptop/poptop-1.3.4/fix-plugins-install.patch
mtn:execute
true
Diffs:
#
# mt diff -rad05460d382bab9b9a47c4935336dad3b90cb041 -r0a38e7566051393faa3d7b2924eecdf612c4c021
#
#
#
# rename "packages/poptop/poptop_1.3.0.bb"
# to "packages/poptop/poptop_1.3.4.bb"
#
# add_dir "packages/poptop/files"
#
# add_dir "packages/poptop/poptop-1.3.4"
#
# add_file "packages/poptop/files/pptpd.init"
# content [b4f8e82e816f5b4c45848ba11fe1f030ee71cf0f]
#
# add_file "packages/poptop/poptop-1.3.4/fix-plugins-install.patch"
# content [2a6d7c79451aa020eb56d646d566031104a288d9]
#
# add_file "packages/poptop/poptop_1.3.0.bb"
# content [c1dacbc579b89e5bb6825a4bdeabb54b004bf92c]
#
# patch "packages/poptop/poptop_1.3.4.bb"
# from [c1dacbc579b89e5bb6825a4bdeabb54b004bf92c]
# to [1ac38d86fa64346a7386e8cc706e7adc1c3a3216]
#
# set "packages/poptop/files/pptpd.init"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/poptop/files/pptpd.init b4f8e82e816f5b4c45848ba11fe1f030ee71cf0f
+++ packages/poptop/files/pptpd.init b4f8e82e816f5b4c45848ba11fe1f030ee71cf0f
@@ -0,0 +1,37 @@
+#! /bin/sh
+
+test -f /usr/sbin/pptpd || exit 0
+test -f /etc/default/pptpd && . /etc/default/pptpd
+
+case $1 in
+ start)
+ echo -n "Starting PPTP server: pptpd"
+ start-stop-daemon --start --quiet --pidfile /var/run/pptpd.pid \
+ --exec /usr/sbin/pptpd
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping PPTP server: pptpd"
+ start-stop-daemon --stop --quiet --pidfile /var/run/pptpd.pid \
+ --exec /usr/sbin/pptpd
+ echo "."
+ ;;
+ status)
+ pid=$(pidof pptpd)
+ if [ -n "$pid" ] ; then
+ echo "Running with pid $pid"
+ else
+ echo "Not running"
+ fi
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/pptpd {start|stop|restart|force-reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
============================================================
--- packages/poptop/poptop-1.3.4/fix-plugins-install.patch 2a6d7c79451aa020eb56d646d566031104a288d9
+++ packages/poptop/poptop-1.3.4/fix-plugins-install.patch 2a6d7c79451aa020eb56d646d566031104a288d9
@@ -0,0 +1,26 @@
+Don't try and install as root.
+Always set LIBDIR to the include the DESTDIR, otherwise it uses the
+incorrect value set in the toplevel makefile.
+
+Index: pptpd-1.3.4/plugins/Makefile
+===================================================================
+--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 12:02:01.000000000 +1000
++++ pptpd-1.3.4/plugins/Makefile 2007-06-09 11:42:57.000000000 +1000
+@@ -3,7 +3,7 @@
+ CFLAGS = $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS = -shared
+ LDADD = -lutil
+-INSTALL = install -o root
++INSTALL = install
+ prefix = /usr/local
+
+ PLUGINS = pptpd-logwtmp.so
+@@ -18,7 +18,7 @@
+ %.so: %.c
+ $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD)
+
+-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd
++LIBDIR = $(DESTDIR)$(prefix)/lib/pptpd
+
+ install: $(PLUGINS)
+ $(INSTALL) -d $(LIBDIR)
============================================================
--- packages/poptop/poptop_1.3.0.bb c1dacbc579b89e5bb6825a4bdeabb54b004bf92c
+++ packages/poptop/poptop_1.3.0.bb c1dacbc579b89e5bb6825a4bdeabb54b004bf92c
@@ -0,0 +1,35 @@
+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}/
+
+
+}
+
============================================================
--- packages/poptop/poptop_1.3.0.bb c1dacbc579b89e5bb6825a4bdeabb54b004bf92c
+++ packages/poptop/poptop_1.3.4.bb 1ac38d86fa64346a7386e8cc706e7adc1c3a3216
@@ -1,35 +1,40 @@
-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"
+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"
+HOMEPAGE = "http://www.poptop.org/"
SECTION = "network"
-PRIORITY = "optional"
-DEPENDS = "ppp"
-RDEPENDS = "ppp"
-
+LICENSE = "GPL"
+RDEPENDS_${PN} = "ppp"
+RDEPENDS_${PN}-logwtmp-plugin = "${PN}"
PR = "r0"
-inherit autotools
+SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz \
+ file://fix-plugins-install.patch;patch=1 \
+ file://pptpd.init"
-SRC_URI = "${SOURCEFORGE_MIRROR}/poptop/pptpd-${PV}.tar.gz"
S = "${WORKDIR}/pptpd-${PV}"
+inherit autotools update-rc.d
+do_install_append() {
+ # Install init script
+ install -m 0755 -d ${D}${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/pptpd.init ${D}${sysconfdir}/init.d/pptpd
+ # Install
+ 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}/
+}
-do_install() {
- install -d ${D}${sbindir}
- install -d ${D}/${sysconfdir}
- install -d ${D}/${sysconfdir}/ppp/
+PACKAGES = "${PN}-dbg ${PN}-bcrelay ${PN}-logwtmp-plugin ${PN} ${PN}-doc"
- 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}/
+FILES_${PN}-bcrelay = "${sbindir}/bcrelay"
+FILES_${PN}-logwtmp-plugin = "${libdir}/pptpd/pptpd-logwtmp.so"
+CONFFILES_${PN} = "${sysconfdir}/pptpd.conf \
+ ${sysconfdir}/ppp/options.pptpd"
+INITSCRIPT_NAME = "pptpd"
+INITSCRIPT_PARAMS = "defaults 92 08"
-}
-
More information about the Openembedded-commits
mailing list