CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

proftpd: upgrade 1.3.8b -> 1.3.8c

Browse Source 
See https://github.com/proftpd/proftpd/blob/1.3.8/RELEASE_NOTES

Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Peter Marko 2025-01-15 19:12:00 +01:00 committed by Khem Raj
parent 92fe348b76
commit 7fce6b033b
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
View File

@ -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])

8
meta-networking/recipes-daemons/proftpd/files/contrib.patch
View File

@ -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

2
meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb → meta-networking/recipes-daemons/proftpd/proftpd_1.3.8c.bb
View File

@ -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 \