update webmin and proftpd

PATCH Applied Kevin Strasser 3 participants 6 messages Sep 10, 2012 – Sep 14, 2012

lore

Share & tools

lore

Kevin Strasser

author

2012-09-10 21:49 UTC #0 lore raw

cover update webmin and proftpd

The following changes since commit d1559674ad3364dbee6b7850803c738feb9f4a93:

Fix up python function whitespacing (2012-08-06 19:01:49 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib strassek/baryon-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-updates

Kevin Strasser (2):
webmin: update package to 1.590
proftpd: update package to 1.3.4b

 recipes-extended/proftpd/files/contrib.patch       |   38 ++++++++++++++++++++
 .../{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb}       |    7 ++--
 .../webmin/files/fdisk-partprobe-fix.patch         |   16 ---------
 .../webmin/{webmin_1.570.bb => webmin_1.590.bb}    |    7 ++--
 4 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 rename recipes-extended/proftpd/{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb} (82%)
 delete mode 100644 recipes-extended/webmin/files/fdisk-partprobe-fix.patch
 rename recipes-extended/webmin/{webmin_1.570.bb => webmin_1.590.bb} (96%)

Signature · 1 line

1.7.9.5

Kevin Strasser

author

2012-09-10 21:50 UTC #1 lore raw

PATCH 1/2 webmin: update package to 1.590

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

Signed-off-by Kevin Strasser <[email protected]>

---
 .../webmin/files/fdisk-partprobe-fix.patch         |   16 ----------------
 .../webmin/{webmin_1.570.bb => webmin_1.590.bb}    |    7 +++----
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 recipes-extended/webmin/files/fdisk-partprobe-fix.patch
 rename recipes-extended/webmin/{webmin_1.570.bb => webmin_1.590.bb} (96%)

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.590.bb renamed from recipes-extended/webmin/webmin_1.570.bb +3 -4

similarity index 96%
rename from recipes-extended/webmin/webmin_1.570.bb
rename to recipes-extended/webmin/webmin_1.590.bb
index cf52030..a408092 100644
@@ -9,13 +9,12 @@ RDEPENDS_${PN} += "perl-module-warnings perl-module-warnings-register perl-modul
 RDEPENDS_${PN} += "perl-module-fcntl perl-module-tie-hash perl-module-vars perl-module-time-local perl-module-config perl-module-constant"
 RDEPENDS_${PN} += "perl-module-file perl-module-file-glob perl-module-file-copy perl-module-sdbm perl-module-sdbm-file perl-module-timelocal perl-module-feature"
 
-PR = "r13"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://setup.sh \
           file://init-exclude.patch \
           file://net-generic.patch \
-          file://fdisk-partprobe-fix.patch \
           file://remove-startup-option.patch \
           file://disable-version-check.patch \
           file://nfs-export.patch \

@@ -26,8 +25,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
           file://net-lib.pl.patch \
           file://media-tomb.patch"
 
-SRC_URI[md5sum] = "20b4f488637366c39458b9b93162eff3"
-SRC_URI[sha256sum] = "3b8ad51dee0e61e330c8137b3d8cff91a00cf31d710b68e272fe02db25baaf54"
+SRC_URI[md5sum] = "815005ed7f208dcfbda5308b446779c2"
+SRC_URI[sha256sum] = "07b06612a8bc864388d86b55ec9a9adba0fa71ec60cc66d87c0e58280264182d"
 
 inherit allarch perlnative update-rc.d

Signature · 1 line

1.7.9.5

Kevin Strasser

author

2012-09-10 21:51 UTC #2 lore raw

PATCH 2/2 proftpd: update package to 1.3.4b

The contrib directry now contains its own Makefile which is used during installation. It was required to pass DESTDIR through when it gets called from the base Makefile.

Signed-off-by Kevin Strasser <[email protected]>

---
 recipes-extended/proftpd/files/contrib.patch       |   38 ++++++++++++++++++++
 .../{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb}       |    7 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 rename recipes-extended/proftpd/{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb} (82%)

recipes-extended/proftpd/files/contrib.patch new file +38 -0

new file mode 100644
index 0000000..76b9a5c
@@ -0,0 +1,38 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Kevin Strasser <[email protected]>
+---
+ Makefile.in         |    2 +-
+ contrib/Makefile.in |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+diff --git a/contrib/Makefile.in b/contrib/Makefile.in
+index 5bcc038..51d248c 100644
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
+@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
+ 	cd ../ && ./config.status
+ 
+ install-utils:
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
++	$(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
++	$(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
++	$(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
+-- 
+1.7.9.5
+

recipes-extended/proftpd/proftpd_1.3.4b.bb renamed from recipes-extended/proftpd/proftpd_1.3.3c.bb +4 -3

similarity index 82%
rename from recipes-extended/proftpd/proftpd_1.3.3c.bb
rename to recipes-extended/proftpd/proftpd_1.3.4b.bb
index 8de80fc..b7e201b 100644
@@ -2,17 +2,18 @@ DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a"
+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] = "4f2c554d6273b8145095837913ba9e5d"
-SRC_URI[sha256sum] = "44be095ed063df93278928cf665ad7b9b38e2c8d0cca97fb51307ec3a390a591"
+SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"
+SRC_URI[sha256sum] = "9f659585cea90fc6af34a0ffae4a90e4ed37abe92dbd9b6c311f95a436c961cb"
 
 EXTRA_OECONF = "ac_cv_func_setpgrp_void=yes ac_cv_func_setgrent_void=yes --disable-cap"
 LDFLAGS += "-Llib"

Signature · 1 line

1.7.9.5

Paul Eggleton

2012-09-13 10:02 UTC #3 lore raw

Re: [meta-baryon][PATCH 2/2] proftpd: update package to 1.3.4b

Hi Kevin,

Quoted 69 lines · On Monday 10 September 2012 14:50:10 Kevin Strasser wrote:

The contrib directry now contains its own Makefile which is used during installation. It was required to pass DESTDIR through when it gets called from the base Makefile.
Signed-off-by Kevin Strasser <[email protected]>
---
 recipes-extended/proftpd/files/contrib.patch       |   38
++++++++++++++++++++ .../{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb}       |  
 7 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 rename recipes-extended/proftpd/{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb}
(82%)
(quoted diff) +0 -0
b/recipes-extended/proftpd/files/contrib.patch new file mode 100644 index 0000000..76b9a5c
recipes-extended/proftpd/files/contrib.patch new file +13 -0
@@ -0,0 +1,38 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Kevin Strasser <[email protected]>
+---
+ Makefile.in         |    2 +-
+ contrib/Makefile.in |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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 +12 -0
+ 	$(INSTALL_BIN)  ftpcount $(DESTDIR)$(bindir)/ftpcount
+ 	$(INSTALL_BIN)  ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
+ 	$(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+diff --git a/contrib/Makefile.in b/contrib/Makefile.in
+index 5bcc038..51d248c 100644
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
+@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
+ 	cd ../ && ./config.status
+
+ install-utils:
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd
$(DESTDIR)$(bindir)/ftpasswd +- $(INSTALL) -o $(INSTALL_USER) -g
$(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail +- $(INSTALL)
-o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota
$(DESTDIR)$(bindir)/ftpquota ++ $(INSTALL) -m 0755 ftpasswd
$(DESTDIR)$(bindir)/ftpasswd
++ $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
++ $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
+--
+1.7.9.5
recipes-extended/proftpd/files/contrib.patch new file +1 -0
+
(quoted diff) +0 -0
b/recipes-extended/proftpd/proftpd_1.3.4b.bb similarity index 82% rename from recipes-extended/proftpd/proftpd_1.3.3c.bb rename to recipes-extended/proftpd/proftpd_1.3.4b.bb index 8de80fc..b7e201b 100644

recipes-extended/proftpd/proftpd_1.3.4b.bb DESCRIPTION = "Secure ftp daemon" · line 5

Quoted 5 lines

recipes-extended/proftpd/proftpd_1.3.4b.bb renamed from recipes-extended/proftpd/proftpd_1.3.3c.bb +1 -1

@@ -2,17 +2,18 @@ DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"

A few points:

1) Re contrib.patch - surely it would be valid to pass DESTDIR through for everyone? If so we should be able to consider sending this patch upstream, in which case Upstream-Status should be Pending.

2) When LIC_FILES_CHKSUM changes for any reason we need to mention clearly why in the commit message (even if it is a mundane reason such as the copyright year changing).

3) Minor - s/directry/directory in the commit message.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

[email protected]

2012-09-13 18:10 UTC #4 lore raw

Re: [meta-baryon][PATCH 2/2] proftpd: update package to 1.3.4b

Thanks, Paul. I've made those changes and added the bbappend for the new kernel.

The updates are available in the git repository at:

git://git.yoctoproject.org/poky-contrib strassek/baryon-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-updates

-Kevin

Quoted 110 lines

Hi Kevin,
Quoted 76 lines · On Monday 10 September 2012 14:50:10 Kevin Strasser wrote:
The contrib directry now contains its own Makefile which is used during installation. It was required to pass DESTDIR through when it gets called from the base Makefile.
Signed-off-by Kevin Strasser <[email protected]>
---
 recipes-extended/proftpd/files/contrib.patch       |   38
++++++++++++++++++++ .../{proftpd_1.3.3c.bb => proftpd_1.3.4b.bb}
|
 7 ++--
 2 files changed, 42 insertions(+), 3 deletions(-)
 create mode 100644 recipes-extended/proftpd/files/contrib.patch
 rename recipes-extended/proftpd/{proftpd_1.3.3c.bb =>
proftpd_1.3.4b.bb}
(82%)
(quoted diff) +0 -0
b/recipes-extended/proftpd/files/contrib.patch new file mode 100644 index 0000000..76b9a5c
recipes-extended/proftpd/files/contrib.patch new file +13 -0
@@ -0,0 +1,38 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Kevin Strasser <[email protected]>
+---
+ Makefile.in         |    2 +-
+ contrib/Makefile.in |    6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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 +12 -0
+ 	$(INSTALL_BIN)  ftpcount $(DESTDIR)$(bindir)/ftpcount
+ 	$(INSTALL_BIN)  ftpdctl  $(DESTDIR)$(bindir)/ftpdctl
+ 	$(INSTALL_SBIN) ftpscrub $(DESTDIR)$(sbindir)/ftpscrub
+diff --git a/contrib/Makefile.in b/contrib/Makefile.in
+index 5bcc038..51d248c 100644
+--- a/contrib/Makefile.in
++++ b/contrib/Makefile.in
+@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
+ 	cd ../ && ./config.status
+
+ install-utils:
+-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd
$(DESTDIR)$(bindir)/ftpasswd +- $(INSTALL) -o $(INSTALL_USER) -g
$(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
+- $(INSTALL)
-o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota
$(DESTDIR)$(bindir)/ftpquota ++ $(INSTALL) -m 0755 ftpasswd
$(DESTDIR)$(bindir)/ftpasswd
++ $(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
++ $(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
+--
+1.7.9.5
recipes-extended/proftpd/files/contrib.patch new file +1 -0
+
(quoted diff) +0 -0
b/recipes-extended/proftpd/proftpd_1.3.4b.bb similarity index 82% rename from recipes-extended/proftpd/proftpd_1.3.3c.bb rename to recipes-extended/proftpd/proftpd_1.3.4b.bb index 8de80fc..b7e201b 100644
recipes-extended/proftpd/proftpd_1.3.4b.bb renamed from recipes-extended/proftpd/proftpd_1.3.3c.bb +0 -1
@@ -2,17 +2,18 @@ DESCRIPTION = "Secure ftp daemon"
 SECTION = "console/network"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM =
Quoted 3 lines
"file://COPYING;md5=fdedcde17b1ffd967d86c20fe0ac158a" +LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
A few points:
1) Re contrib.patch - surely it would be valid to pass DESTDIR through for everyone? If so we should be able to consider sending this patch upstream, in
which case Upstream-Status should be Pending.
2) When LIC_FILES_CHKSUM changes for any reason we need to mention clearly why
in the commit message (even if it is a mundane reason such as the copyright
year changing).
3) Minor - s/directry/directory in the commit message.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Paul Eggleton

Applied

2012-09-14 17:11 UTC #5 lore raw

Re: [meta-baryon][PATCH 2/2] proftpd: update package to 1.3.4b

Quoted 9 lines · On Thursday 13 September 2012 11:10:40 [email protected] wrote:

Thanks, Paul. I've made those changes and added the bbappend for the new kernel.
The updates are available in the git repository at:
git://git.yoctoproject.org/poky-contrib strassek/baryon-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/baryon-up
dates

Merged to meta-baryon master, thanks.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre