From: Peter Marko <[email protected]> See https://github.com/proftpd/proftpd/blob/1.3.8/RELEASE_NOTES
Signed-off-by: Peter Marko <[email protected]> --- .../proftpd/files/build_fixup.patch | 20 +++++++++---------- .../proftpd/files/contrib.patch | 8 ++++---- .../{proftpd_1.3.8b.bb => proftpd_1.3.8c.bb} | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.8b.bb => proftpd_1.3.8c.bb} (99%) diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 8126b3619a..2b01d3a682 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch @@ -30,7 +30,7 @@ diff --git a/Makefile.in b/Makefile.in index 9434cbd..13f2e16 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) +@@ -129,7 +129,6 @@ check: proftpd$(EXEEXT) $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: @if [ ! -d $@ ]; then \ mkdir -p $@; \ @@ -38,18 +38,18 @@ index 9434cbd..13f2e16 100644 chmod 0755 $@; \ fi -@@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate +@@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$( rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ fi - ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd + ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd install-libs: $(DESTDIR)$(libdir)/proftpd cd lib/ && $(MAKE) install -@@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) - $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut - $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop - $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho +@@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) + $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut + $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop + $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs @@ -64,7 +64,7 @@ diff --git a/configure b/configure index 0a51670..69fa130 100755 --- a/configure +++ b/configure -@@ -25116,7 +25116,7 @@ _ACEOF +@@ -25683,7 +25683,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -73,7 +73,7 @@ index 0a51670..69fa130 100755 _ACEOF -@@ -25126,7 +25126,7 @@ _ACEOF +@@ -25693,7 +25693,7 @@ _ACEOF cat >>confdefs.h <<_ACEOF @@ -86,7 +86,7 @@ diff --git a/configure.in b/configure.in index 50561de..93cad3f 100644 --- a/configure.in +++ b/configure.in -@@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" +@@ -4248,8 +4248,8 @@ locale_dir="`eval echo ${locale_dir}`" AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch index 96c237d386..53f7b89556 100644 --- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch @@ -14,15 +14,15 @@ diff --git a/Makefile.in b/Makefile.in index 9434cbd..8da7d1f 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -163,7 +163,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir) +@@ -170,7 +170,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) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount - $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl - $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub + $(INSTALL_BIN) $(top_builddir)/ftpcount $(DESTDIR)$(bindir)/ftpcount + $(INSTALL_BIN) $(top_builddir)/ftpdctl $(DESTDIR)$(bindir)/ftpdctl + $(INSTALL_SBIN) $(top_builddir)/ftpscrub $(DESTDIR)$(sbindir)/ftpscrub diff --git a/contrib/Makefile.in b/contrib/Makefile.in index d1a31af..65d2abc 100644 --- a/contrib/Makefile.in diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8c.bb similarity index 99% rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.8c.bb index 0e8942e977..ece5e14109 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8c.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"; LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" -SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99" +SRCREV = "30eef4d42d9efbc4aafada28130abca993af99a2" BRANCH = "1.3.8" SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#114901): https://lists.openembedded.org/g/openembedded-devel/message/114901 Mute This Topic: https://lists.openembedded.org/mt/110632639/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
