mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-17 04:37:19 +00:00
Code Issues Projects Releases Wiki Activity

proftpd: Update to 1.3.6 release

Browse Source 
Use the new gnu-config files for musl support

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Khem Raj
2017-06-01 23:50:16 -07:00
committed by Joe MacDonald
parent 0d010f8241
commit de124b8dba
2 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
+27 -27
View File
@@ -9,11 +9,11 @@ redefine PR_RUN_DIR as ${localstatedir}/run
Signed-off-By: Armin Kuster <akuster808@gmail.com> Signed-off-By: Armin Kuster <akuster808@gmail.com>
Index: proftpd-1.3.5/Make.rules.in Index: proftpd-1.3.6/Make.rules.in
=================================================================== ===================================================================
--- proftpd-1.3.5.orig/Make.rules.in --- proftpd-1.3.6.orig/Make.rules.in
+++ proftpd-1.3.5/Make.rules.in +++ proftpd-1.3.6/Make.rules.in
@@ -29,9 +29,9 @@ INSTALL=@INSTALL@ @@ -30,9 +30,9 @@ INSTALL=@INSTALL@
INSTALL_STRIP=@INSTALL_STRIP@ INSTALL_STRIP=@INSTALL_STRIP@
INSTALL_USER=@install_user@ INSTALL_USER=@install_user@
INSTALL_GROUP=@install_group@ INSTALL_GROUP=@install_group@
@@ -26,10 +26,10 @@ Index: proftpd-1.3.5/Make.rules.in
RM=rm -f RM=rm -f
SHELL=@CONFIG_SHELL@ SHELL=@CONFIG_SHELL@
Index: proftpd-1.3.5/Makefile.in Index: proftpd-1.3.6/Makefile.in
=================================================================== ===================================================================
--- proftpd-1.3.5.orig/Makefile.in --- proftpd-1.3.6.orig/Makefile.in
+++ proftpd-1.3.5/Makefile.in +++ proftpd-1.3.6/Makefile.in
@@ -105,7 +105,6 @@ check: proftpd$(EXEEXT) @@ -105,7 +105,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: $(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 \ @if [ ! -d $@ ]; then \
@@ -60,11 +60,11 @@ Index: proftpd-1.3.5/Makefile.in
$(top_srcdir)/sample-configurations/basic.conf \ $(top_srcdir)/sample-configurations/basic.conf \
$(DESTDIR)$(sysconfdir)/proftpd.conf ; \ $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
fi fi
Index: proftpd-1.3.5/configure Index: proftpd-1.3.6/configure
=================================================================== ===================================================================
--- proftpd-1.3.5.orig/configure --- proftpd-1.3.6.orig/configure
+++ proftpd-1.3.5/configure +++ proftpd-1.3.6/configure
@@ -38255,7 +38255,7 @@ _ACEOF @@ -41777,7 +41777,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@@ -72,9 +72,9 @@ Index: proftpd-1.3.5/configure
+#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`" +#define PR_RUN_DIR "`eval echo "${localstatedir}"/run/`"
_ACEOF _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -38263,7 +38263,7 @@ cat >>confdefs.h <<_ACEOF @@ -41787,7 +41787,7 @@ _ACEOF
_ACEOF
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
-#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
@@ -82,25 +82,25 @@ Index: proftpd-1.3.5/configure
_ACEOF _ACEOF
Index: proftpd-1.3.5/configure.in Index: proftpd-1.3.6/configure.in
=================================================================== ===================================================================
--- proftpd-1.3.5.orig/configure.in --- proftpd-1.3.6.orig/configure.in
+++ proftpd-1.3.5/configure.in +++ proftpd-1.3.6/configure.in
@@ -2971,8 +2971,8 @@ locale_dir="`eval echo ${locale_dir}`" @@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`"
AC_DEFINE_UNQUOTED(PR_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}"`") AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory])
-AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") -AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`", [Define the configuration file path])
-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`", [Define the PID file path])
+AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`") +AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/run/proftpd.conf"`", [Define the configuration file path])
+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`", [Define the PID file path])
prefix="$pr_saved_prefix" prefix="$pr_saved_prefix"
exec_prefix="$pr_saved_exec_prefix" exec_prefix="$pr_saved_exec_prefix"
Index: proftpd-1.3.5/lib/libcap/Makefile Index: proftpd-1.3.6/lib/libcap/Makefile
=================================================================== ===================================================================
--- proftpd-1.3.5.orig/lib/libcap/Makefile --- proftpd-1.3.6.orig/lib/libcap/Makefile
+++ proftpd-1.3.5/lib/libcap/Makefile +++ proftpd-1.3.6/lib/libcap/Makefile
@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
all: $(LIBNAME) all: $(LIBNAME)
meta-networking/recipes-daemons/proftpd/proftpd_1.3.5b.bb → meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
+4 -3
View File
@@ -13,9 +13,8 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
file://build_fixup.patch \ file://build_fixup.patch \
file://proftpd.service \ file://proftpd.service \
" "
iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
SRC_URI[md5sum] = "f7b8e3a383b34a894c2502db74ccccde" SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
SRC_URI[sha256sum] = "afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8"
inherit autotools-brokensep useradd update-rc.d systemd inherit autotools-brokensep useradd update-rc.d systemd
@@ -63,6 +62,8 @@ PACKAGECONFIG[auth] = "--enable-auth-file, --disable-auth-file"
# proftpd uses libltdl which currently makes configuring using # proftpd uses libltdl which currently makes configuring using
# autotools.bbclass a pain... # autotools.bbclass a pain...
do_configure () { do_configure () {
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}
install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
oe_runconf oe_runconf
cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}/libtool
} }