Skip to contentSkip to conversation

proftpd: update package to 1.3.4b

PATCH In review Kevin Strasser 2 participants 3 messages Aug 6, 2012 – Sep 6, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 proftpd: update package to 1.3.4b

The contrib directory now contains its own Makefile which is used during installation. It was required to pass in the DESTDIR variable.

---
 recipes-extended/proftpd/files/contrib.patch |   25 ++++++++++++
 recipes-extended/proftpd/proftpd_1.3.3c.bb   |   53 -------------------------
 recipes-extended/proftpd/proftpd_1.3.4b.bb   |   54 ++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 53 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 delete mode 100644 recipes-extended/proftpd/proftpd_1.3.3c.bb
 create mode 100644 recipes-extended/proftpd/proftpd_1.3.4b.bb
recipes-extended/proftpd/files/contrib.patch new file +25 -0
new file mode 100644
index 0000000..d97cd69
@@ -0,0 +1,25 @@
+DESTDIR needs to be passed through to the contrib Makefile
+
+Upstream-Status: Pending
+
+Signed-off-by: Kevin Strasser <[email protected]>
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5b2e683..ee72fe1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
+ 	test -z "$(SHARED_MODULE_OBJS)" -a -z "$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install)
+ 
+ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
+-	cd contrib/ && $(MAKE) install-utils
++	cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils
+ 	$(INSTALL_BIN)  ftpcount $(DESTDIR)$(bindir)/ftpcount
+ 	$(INSTALL_BIN)  ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
+ 	$(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+-- 
+1.7.9.5
+
recipes-extended/proftpd/proftpd_1.3.3c.bb deleted +0 -53

53 lines not on this page · raw message

recipes-extended/proftpd/proftpd_1.3.4b.bb new file +54 -0

54 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 webmin: update package to 1.590

The patch "fdisk-partprobe-fix.patch" has been accepted upstream and is no longer needed.

---
 .../webmin/files/fdisk-partprobe-fix.patch         |   16 ---
 recipes-extended/webmin/webmin_1.570.bb            |  147 --------------------
 recipes-extended/webmin/webmin_1.590.bb            |  146 +++++++++++++++++++
 3 files changed, 146 insertions(+), 163 deletions(-)
 delete mode 100644 recipes-extended/webmin/files/fdisk-partprobe-fix.patch
 delete mode 100644 recipes-extended/webmin/webmin_1.570.bb
 create mode 100644 recipes-extended/webmin/webmin_1.590.bb
recipes-extended/webmin/files/fdisk-partprobe-fix.patch deleted +0 -16
deleted file mode 100644
index 2279c96..0000000
@@ -1,16 +0,0 @@
-# Fix prepending partprobe command in fdisk module library code
-#
-# Upstream-status: Pending
-#
-# Signed-off-by: Paul Eggleton <[email protected]>
---- webmin-1.570.orig/fdisk/fdisk-lib.pl
-+++ webmin-1.570/fdisk/fdisk-lib.pl
-@@ -940,7 +940,7 @@ elsif ($_[0] eq "fatx") {
- 	$cmd = "mkfs -t $_[0] $_[1]";
- 	}
- if (&has_command("partprobe")) {
--	$cmd .= "partprobe ; $cmd";
-+	$cmd = "partprobe ; $cmd";
- 	}
- return $cmd;
- }
recipes-extended/webmin/webmin_1.570.bb deleted +0 -147

147 lines not on this page · raw message

recipes-extended/webmin/webmin_1.590.bb new file +146 -0

146 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw
In reply to Kevin Strasser
Quoted 156 lines · On Monday 06 August 2012 14:05:15 Kevin Strasser wrote:

The contrib directory now contains its own Makefile which is used during installation. It was required to pass in the DESTDIR variable.

---
 recipes-extended/proftpd/files/contrib.patch |   25 ++++++++++++
 recipes-extended/proftpd/proftpd_1.3.3c.bb   |   53
------------------------- recipes-extended/proftpd/proftpd_1.3.4b.bb   |  
54 ++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 53
deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 delete mode 100644 recipes-extended/proftpd/proftpd_1.3.3c.bb
 create mode 100644 recipes-extended/proftpd/proftpd_1.3.4b.bb
(quoted diff) +0 -0

b/recipes-extended/proftpd/files/contrib.patch new file mode 100644 index 0000000..d97cd69

recipes-extended/proftpd/files/contrib.patch new file +14 -0
@@ -0,0 +1,25 @@
+DESTDIR needs to be passed through to the contrib Makefile
+
+Upstream-Status: Pending
+
+Signed-off-by: Kevin Strasser <[email protected]>
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5b2e683..ee72fe1 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir)

$(DESTDIR)$(sysconfdir) + test -z "$(SHARED_MODULE_OBJS)" -a -z
"$(SHARED_MODULE_DIRS)" -a -z "$(STATIC_MODULE_DIRS)" || (cd modules/ && $(MAKE) install) +
+ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
+- cd contrib/ && $(MAKE) install-utils
++ cd contrib/ && $(MAKE) DESTDIR=${DESTDIR} install-utils

recipes-extended/proftpd/files/contrib.patch new file +6 -0
+ 	$(INSTALL_BIN)  ftpcount $(DESTDIR)$(bindir)/ftpcount
+ 	$(INSTALL_BIN)  ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
+ 	$(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+--
+1.7.9.5
+
(quoted diff) +0 -0

b/recipes-extended/proftpd/proftpd_1.3.3c.bb deleted file mode 100644 index 8de80fc..0000000

recipes-extended/proftpd/proftpd_1.3.3c.bb deleted +0 -15
@@ -1,53 +0,0 @@
-DESCRIPTION = "Secure ftp daemon"
-SECTION = "console/network"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a"
-
-PR = "r0"
-
-SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
-	file://make.patch \
-	file://basic.conf.patch \
-	"
-
-SRC_URI[md5sum] = "4f2c554d6273b8145095837913ba9e5d"
-SRC_URI[sha256sum] =

"44be095ed063df93278928cf665ad7b9b38e2c8d0cca97fb51307ec3a390a591" -

recipes-extended/proftpd/proftpd_1.3.3c.bb deleted +0 -37
-EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes
--disable-cap" -LDFLAGS += "-Llib"
-PARALLEL_MAKE = ""
-
-do_configure () {
-	 ./configure \
-		   --disable-auth-pam \
-                   --build=${BUILD_SYS} \
-                   --host=${HOST_SYS} \
-                   --target=${TARGET_SYS} \
-                   --prefix=/usr \
-		   --sysconfdir=/etc \
-		   --sharedstatedir=/com \
-		   --localstatedir=/var \
-                   ${EXTRA_OECONF} \
-                   $@;
-}
-
-do_install () {
-    oe_runmake DESTDIR=${D} install
-}
-
-pkg_postinst () {
-    if [ "x$D" != "x" ] ; then
-        exit 1
-    fi
-
-    # more chown's might be needed
-    chown root:root /usr/sbin/proftpd
-
-    # create the ftp user
-    username='ftp'
-    addgroup ${username}
-    adduser --disabled-password ${username} --ingroup ${username}
-    mkdir -p /home/${username}/pub/
-    chown -R ftp:ftp /home/${username}/pub
-}
(quoted diff) +0 -0

b/recipes-extended/proftpd/proftpd_1.3.4b.bb new file mode 100644 index 0000000..b7e201b

recipes-extended/proftpd/proftpd_1.3.4b.bb new file +16 -0
@@ -0,0 +1,54 @@
+DESCRIPTION = "Secure ftp daemon"
+SECTION = "console/network"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
+
+PR = "r0"
+
+SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${PN}-${PV}.tar.gz \
+	file://make.patch \
+	file://basic.conf.patch \
+	file://contrib.patch \
+	"
+
+SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"
+SRC_URI[sha256sum] =

"9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb" +

recipes-extended/proftpd/proftpd_1.3.4b.bb new file +26 -1
+EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes
--disable-cap" +LDFLAGS += "-Llib"
+PARALLEL_MAKE = ""
+
+do_configure () {
+	 ./configure \
+		   --disable-auth-pam \
+                   --build=${BUILD_SYS} \
+                   --host=${HOST_SYS} \
+                   --target=${TARGET_SYS} \
+                   --prefix=/usr \
+		   --sysconfdir=/etc \
+		   --sharedstatedir=/com \
+		   --localstatedir=/var \
+                   ${EXTRA_OECONF} \
+                   $@;
+}
+
+do_install () {
+    oe_runmake DESTDIR=${D} install
+}
+
+pkg_postinst () {
+    if [ "x$D" != "x" ] ; then
+        exit 1
+    fi
+

recipes-extended/proftpd/proftpd_1.3.4b.bb line 54

Quoted 10 lines
recipes-extended/proftpd/proftpd_1.3.4b.bb new file +10 -0
+    # more chown's might be needed
+    chown root:root /usr/sbin/proftpd
+
+    # create the ftp user
+    username='ftp'
+    addgroup ${username}
+    adduser --disabled-password ${username} --ingroup ${username}
+    mkdir -p /home/${username}/pub/
+    chown -R ftp:ftp /home/${username}/pub
+}

Sorry for the late reply Kevin. Would you mind re-sending these two using -M so that the changes are obvious?

Thanks,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre