diff options
| -rw-r--r-- | recipes-extended/proftpd/files/contrib.patch | 38 | ||||
| -rw-r--r-- | recipes-extended/proftpd/proftpd_1.3.4b.bb (renamed from recipes-extended/proftpd/proftpd_1.3.3c.bb) | 7 |
2 files changed, 42 insertions, 3 deletions
diff --git a/recipes-extended/proftpd/files/contrib.patch b/recipes-extended/proftpd/files/contrib.patch new file mode 100644 index 0000000..6d9235a --- /dev/null +++ b/recipes-extended/proftpd/files/contrib.patch @@ -0,0 +1,38 @@ +Upstream-Status: Pending + +Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> +--- + 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 + diff --git a/recipes-extended/proftpd/proftpd_1.3.3c.bb b/recipes-extended/proftpd/proftpd_1.3.4b.bb index 8de80fc..b7e201b 100644 --- a/recipes-extended/proftpd/proftpd_1.3.3c.bb +++ b/recipes-extended/proftpd/proftpd_1.3.4b.bb @@ -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" |