* Re: [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
@ 2020-04-15 2:26 ` Khem Raj
2020-04-20 8:45 ` 答复: " Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] cpuid: upgrade 20200203 -> 20200211 Wang Mingyu
` (3 subsequent siblings)
4 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2020-04-15 2:26 UTC (permalink / raw)
To: Wang Mingyu; +Cc: openembeded-devel
On Tue, Apr 14, 2020 at 6:50 PM Wang Mingyu <wangmy@cn.fujitsu.com> wrote:
>
> refresh the following patches:
> build_fixup.patch
> contrib.patch
>
I am a bit reluctant to take RC versions. Can you justify why we
should upgrade to RC in this case ?
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
> .../proftpd/files/build_fixup.patch | 75 +++++++++----------
> .../proftpd/files/contrib.patch | 29 +++----
> .../{proftpd_1.3.6.bb => proftpd_1.3.7rc3.bb} | 4 +-
> 3 files changed, 52 insertions(+), 56 deletions(-)
> rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.6.bb => proftpd_1.3.7rc3.bb} (97%)
>
> diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> index 9816d4d22..9f45a1c2f 100644
> --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> @@ -7,12 +7,17 @@ move pidfile to /var/run
> redefine PR_RUN_DIR as ${localstatedir}/run
>
> Signed-off-By: Armin Kuster <akuster808@gmail.com>
> +---
> + Make.rules.in | 6 +++---
> + Makefile.in | 6 ++----
> + configure | 4 ++--
> + configure.in | 4 ++--
> + 4 files changed, 9 insertions(+), 11 deletions(-)
>
> -
> -Index: proftpd-1.3.6/Make.rules.in
> -===================================================================
> ---- proftpd-1.3.6.orig/Make.rules.in
> -+++ proftpd-1.3.6/Make.rules.in
> +diff --git a/Make.rules.in b/Make.rules.in
> +index a5028ac..ccd7807 100644
> +--- a/Make.rules.in
> ++++ b/Make.rules.in
> @@ -30,9 +30,9 @@ INSTALL=@INSTALL@
> INSTALL_STRIP=@INSTALL_STRIP@
> INSTALL_USER=@install_user@
> @@ -26,10 +31,10 @@ Index: proftpd-1.3.6/Make.rules.in
>
> RM=rm -f
> SHELL=@CONFIG_SHELL@
> -Index: proftpd-1.3.6/Makefile.in
> -===================================================================
> ---- proftpd-1.3.6.orig/Makefile.in
> -+++ proftpd-1.3.6/Makefile.in
> +diff --git a/Makefile.in b/Makefile.in
> +index abacc9f..be22353 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> @@ -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:
> @if [ ! -d $@ ]; then \
> @@ -38,19 +43,19 @@ Index: proftpd-1.3.6/Makefile.in
> chmod 0755 $@; \
> fi
>
> -@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
> +@@ -115,7 +114,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate
> rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
> fi
> - ln -s 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
> -@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
> - $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
> - $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
> - $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
> -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
> +@@ -152,11 +150,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 src/prxs $(DESTDIR)$(bindir)/prxs
>
> install-conf: $(DESTDIR)$(sysconfdir)
> @@ -60,11 +65,11 @@ Index: proftpd-1.3.6/Makefile.in
> $(top_srcdir)/sample-configurations/basic.conf \
> $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
> fi
> -Index: proftpd-1.3.6/configure
> -===================================================================
> ---- proftpd-1.3.6.orig/configure
> -+++ proftpd-1.3.6/configure
> -@@ -41777,7 +41777,7 @@ _ACEOF
> +diff --git a/configure b/configure
> +index 033f12f..242d18b 100755
> +--- a/configure
> ++++ b/configure
> +@@ -42308,7 +42308,7 @@ _ACEOF
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -73,7 +78,7 @@ Index: proftpd-1.3.6/configure
> _ACEOF
>
>
> -@@ -41787,7 +41787,7 @@ _ACEOF
> +@@ -42318,7 +42318,7 @@ _ACEOF
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -82,11 +87,11 @@ Index: proftpd-1.3.6/configure
> _ACEOF
>
>
> -Index: proftpd-1.3.6/configure.in
> -===================================================================
> ---- proftpd-1.3.6.orig/configure.in
> -+++ proftpd-1.3.6/configure.in
> -@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`"
> +diff --git a/configure.in b/configure.in
> +index a4affa9..5449060 100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -3956,8 +3956,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])
> @@ -97,16 +102,6 @@ Index: proftpd-1.3.6/configure.in
>
> prefix="$pr_saved_prefix"
> exec_prefix="$pr_saved_exec_prefix"
> -Index: proftpd-1.3.6/lib/libcap/Makefile
> -===================================================================
> ---- proftpd-1.3.6.orig/lib/libcap/Makefile
> -+++ proftpd-1.3.6/lib/libcap/Makefile
> -@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
> - all: $(LIBNAME)
> -
> - _makenames: _makenames.c cap_names.sed
> -- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
> -+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@
> -
> - cap_names.h: _makenames
> - ./_makenames > cap_names.h
> +--
> +2.17.1
> +
> diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> index 7e2a8e3ce..e4ff539de 100644
> --- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> @@ -6,37 +6,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(-)
> + Makefile.in | 2 +-
> + contrib/Makefile.in | 7 ++++---
> + 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile.in b/Makefile.in
> -index 5b2e683..ee72fe1 100644
> +index 3f325e5..abacc9f 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> -@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
> +@@ -145,7 +145,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
> + $(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 5bcc038..51d248c 100644
> +index d1a31af..865a6ff 100644
> --- a/contrib/Makefile.in
> +++ b/contrib/Makefile.in
> -@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
> +@@ -17,6 +17,7 @@ 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) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
> +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
> +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/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
> +2.17.1
>
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> similarity index 97%
> rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
> rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> index d5bbdd374..10a9219d1 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> @@ -13,8 +13,8 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
> file://build_fixup.patch \
> file://proftpd.service \
> "
> -iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
> -SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
> +SRC_URI[md5sum] = "2492bed101f2dd798453b389370dadb1"
> +SRC_URI[sha256sum] = "ae06a9da10165407cc525966cf4704b3b54295957fe42a234af52944815dc9ee"
>
> inherit autotools-brokensep useradd update-rc.d systemd multilib_script
>
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1
2020-04-15 8:31 ` [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1 Wang Mingyu
@ 2020-04-15 2:31 ` Khem Raj
2020-04-20 8:47 ` 答复: " Wang Mingyu
0 siblings, 1 reply; 9+ messages in thread
From: Khem Raj @ 2020-04-15 2:31 UTC (permalink / raw)
To: Wang Mingyu; +Cc: openembeded-devel
this is also a pre-release. perhaps we should wait until final release.
On Tue, Apr 14, 2020 at 6:51 PM Wang Mingyu <wangmy@cn.fujitsu.com> wrote:
>
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
> .../{python3-cheetah_3.2.4.bb => python3-cheetah_3.2.5b1.bb} | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> rename meta-python/recipes-devtools/python/{python3-cheetah_3.2.4.bb => python3-cheetah_3.2.5b1.bb} (69%)
>
> diff --git a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> similarity index 69%
> rename from meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
> rename to meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> index 05882d087..289b70298 100644
> --- a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
> +++ b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> @@ -10,5 +10,5 @@ RDEPENDS_${PN}_class-native = ""
>
> BBCLASSEXTEND = "native nativesdk"
>
> -SRC_URI[md5sum] = "8c0ac643263ffc3454fb321342284d0a"
> -SRC_URI[sha256sum] = "caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b"
> +SRC_URI[md5sum] = "5c07ebe4a31edf605a5ab2172bfc411c"
> +SRC_URI[sha256sum] = "52f4abe6cb862fbc6047ac17dc3d7b4bb0faf82621fe911fefbb04b7a5d5a7ee"
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3
@ 2020-04-15 8:31 Wang Mingyu
2020-04-15 2:26 ` Khem Raj
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-15 8:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
refresh the following patches:
build_fixup.patch
contrib.patch
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
.../proftpd/files/build_fixup.patch | 75 +++++++++----------
.../proftpd/files/contrib.patch | 29 +++----
.../{proftpd_1.3.6.bb => proftpd_1.3.7rc3.bb} | 4 +-
3 files changed, 52 insertions(+), 56 deletions(-)
rename meta-networking/recipes-daemons/proftpd/{proftpd_1.3.6.bb => proftpd_1.3.7rc3.bb} (97%)
diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
index 9816d4d22..9f45a1c2f 100644
--- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
+++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
@@ -7,12 +7,17 @@ move pidfile to /var/run
redefine PR_RUN_DIR as ${localstatedir}/run
Signed-off-By: Armin Kuster <akuster808@gmail.com>
+---
+ Make.rules.in | 6 +++---
+ Makefile.in | 6 ++----
+ configure | 4 ++--
+ configure.in | 4 ++--
+ 4 files changed, 9 insertions(+), 11 deletions(-)
-
-Index: proftpd-1.3.6/Make.rules.in
-===================================================================
---- proftpd-1.3.6.orig/Make.rules.in
-+++ proftpd-1.3.6/Make.rules.in
+diff --git a/Make.rules.in b/Make.rules.in
+index a5028ac..ccd7807 100644
+--- a/Make.rules.in
++++ b/Make.rules.in
@@ -30,9 +30,9 @@ INSTALL=@INSTALL@
INSTALL_STRIP=@INSTALL_STRIP@
INSTALL_USER=@install_user@
@@ -26,10 +31,10 @@ Index: proftpd-1.3.6/Make.rules.in
RM=rm -f
SHELL=@CONFIG_SHELL@
-Index: proftpd-1.3.6/Makefile.in
-===================================================================
---- proftpd-1.3.6.orig/Makefile.in
-+++ proftpd-1.3.6/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+index abacc9f..be22353 100644
+--- a/Makefile.in
++++ b/Makefile.in
@@ -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:
@if [ ! -d $@ ]; then \
@@ -38,19 +43,19 @@ Index: proftpd-1.3.6/Makefile.in
chmod 0755 $@; \
fi
-@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
+@@ -115,7 +114,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate
rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
fi
- ln -s 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
-@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
- $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
- $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
- $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
-- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
+@@ -152,11 +150,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 src/prxs $(DESTDIR)$(bindir)/prxs
install-conf: $(DESTDIR)$(sysconfdir)
@@ -60,11 +65,11 @@ Index: proftpd-1.3.6/Makefile.in
$(top_srcdir)/sample-configurations/basic.conf \
$(DESTDIR)$(sysconfdir)/proftpd.conf ; \
fi
-Index: proftpd-1.3.6/configure
-===================================================================
---- proftpd-1.3.6.orig/configure
-+++ proftpd-1.3.6/configure
-@@ -41777,7 +41777,7 @@ _ACEOF
+diff --git a/configure b/configure
+index 033f12f..242d18b 100755
+--- a/configure
++++ b/configure
+@@ -42308,7 +42308,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -73,7 +78,7 @@ Index: proftpd-1.3.6/configure
_ACEOF
-@@ -41787,7 +41787,7 @@ _ACEOF
+@@ -42318,7 +42318,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -82,11 +87,11 @@ Index: proftpd-1.3.6/configure
_ACEOF
-Index: proftpd-1.3.6/configure.in
-===================================================================
---- proftpd-1.3.6.orig/configure.in
-+++ proftpd-1.3.6/configure.in
-@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`"
+diff --git a/configure.in b/configure.in
+index a4affa9..5449060 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3956,8 +3956,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])
@@ -97,16 +102,6 @@ Index: proftpd-1.3.6/configure.in
prefix="$pr_saved_prefix"
exec_prefix="$pr_saved_exec_prefix"
-Index: proftpd-1.3.6/lib/libcap/Makefile
-===================================================================
---- proftpd-1.3.6.orig/lib/libcap/Makefile
-+++ proftpd-1.3.6/lib/libcap/Makefile
-@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
- all: $(LIBNAME)
-
- _makenames: _makenames.c cap_names.sed
-- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-
- cap_names.h: _makenames
- ./_makenames > cap_names.h
+--
+2.17.1
+
diff --git a/meta-networking/recipes-daemons/proftpd/files/contrib.patch b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
index 7e2a8e3ce..e4ff539de 100644
--- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch
+++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
@@ -6,37 +6,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(-)
+ Makefile.in | 2 +-
+ contrib/Makefile.in | 7 ++++---
+ 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 5b2e683..ee72fe1 100644
+index 3f325e5..abacc9f 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir) $(DESTDIR)$(sysconfdir)
+@@ -145,7 +145,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
+ $(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 5bcc038..51d248c 100644
+index d1a31af..865a6ff 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
-@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
+@@ -17,6 +17,7 @@ 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) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
+- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
+- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/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
+2.17.1
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
similarity index 97%
rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
index d5bbdd374..10a9219d1 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
@@ -13,8 +13,8 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
file://build_fixup.patch \
file://proftpd.service \
"
-iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
-SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
+SRC_URI[md5sum] = "2492bed101f2dd798453b389370dadb1"
+SRC_URI[sha256sum] = "ae06a9da10165407cc525966cf4704b3b54295957fe42a234af52944815dc9ee"
inherit autotools-brokensep useradd update-rc.d systemd multilib_script
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [oe] [meta-oe] [PATCH] cpuid: upgrade 20200203 -> 20200211
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
2020-04-15 2:26 ` Khem Raj
@ 2020-04-15 8:31 ` Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe][PATCH] libdvdread: upgrade 6.1.0 -> 6.1.1 Wang Mingyu
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-15 8:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
.../cpuid/{cpuid_20200203.bb => cpuid_20200211.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-devtools/cpuid/{cpuid_20200203.bb => cpuid_20200211.bb} (85%)
diff --git a/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb b/meta-oe/recipes-devtools/cpuid/cpuid_20200211.bb
similarity index 85%
rename from meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb
rename to meta-oe/recipes-devtools/cpuid/cpuid_20200211.bb
index b0540e541..56462a913 100644
--- a/meta-oe/recipes-devtools/cpuid/cpuid_20200203.bb
+++ b/meta-oe/recipes-devtools/cpuid/cpuid_20200211.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "http://www.etallen.com/${BPN}/${BP}.src.tar.gz \
"
-SRC_URI[md5sum] = "93e99fd3d0d6cd5401c0f84f2cce1d8f"
-SRC_URI[sha256sum] = "ebbd6448a1e416d95889a252f7e03a5429ad4f30bc84c7e8ede8086433e86c55"
+SRC_URI[md5sum] = "c3dda40aee78bd187929f454a3c75f35"
+SRC_URI[sha256sum] = "a570ca23ce5543fb6974abcbbde0261ea7dbfea40f4e7335b4870274315e521b"
COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [oe] [meta-oe][PATCH] libdvdread: upgrade 6.1.0 -> 6.1.1
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
2020-04-15 2:26 ` Khem Raj
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] cpuid: upgrade 20200203 -> 20200211 Wang Mingyu
@ 2020-04-15 8:31 ` Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] mksh: upgrade 57 -> 58 Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1 Wang Mingyu
4 siblings, 0 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-15 8:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
.../libdvdread/{libdvdread_6.1.0.bb => libdvdread_6.1.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-multimedia/libdvdread/{libdvdread_6.1.0.bb => libdvdread_6.1.1.bb} (71%)
diff --git a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.0.bb b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb
similarity index 71%
rename from meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.0.bb
rename to meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb
index edf84b8f5..65f5b6adf 100644
--- a/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.0.bb
+++ b/meta-oe/recipes-multimedia/libdvdread/libdvdread_6.1.1.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2"
-SRC_URI[md5sum] = "0f74ad333331ff9bf441e74036f540df"
-SRC_URI[sha256sum] = "501bbd7d1e7d5f2d2a0ff8d0a6ac2fbd7e5e7e0e80ef82fef818f43a30b4750c"
+SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e"
+SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796"
inherit autotools lib_package binconfig pkgconfig
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [oe] [meta-oe] [PATCH] mksh: upgrade 57 -> 58
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
` (2 preceding siblings ...)
2020-04-15 8:31 ` [oe] [meta-oe][PATCH] libdvdread: upgrade 6.1.0 -> 6.1.1 Wang Mingyu
@ 2020-04-15 8:31 ` Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1 Wang Mingyu
4 siblings, 0 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-15 8:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
meta-oe/recipes-shells/mksh/{mksh_57.bb => mksh_58.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-oe/recipes-shells/mksh/{mksh_57.bb => mksh_58.bb} (83%)
diff --git a/meta-oe/recipes-shells/mksh/mksh_57.bb b/meta-oe/recipes-shells/mksh/mksh_58.bb
similarity index 83%
rename from meta-oe/recipes-shells/mksh/mksh_57.bb
rename to meta-oe/recipes-shells/mksh/mksh_58.bb
index 7e9c18ed2..a9940f88a 100644
--- a/meta-oe/recipes-shells/mksh/mksh_57.bb
+++ b/meta-oe/recipes-shells/mksh/mksh_58.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://main.c;beginline=6;endline=26;md5=0651e575e39d1a3e884
file://strlcpy.c;beginline=1;endline=17;md5=d953f28f0c43ee29e238ec9bc15df2a0 \
"
-SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R57.tgz"
+SRC_URI = "http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R58.tgz"
-SRC_URI[md5sum] = "4d2686535252ea6a57bdec531498239a"
-SRC_URI[sha256sum] = "3d101154182d52ae54ef26e1360c95bc89c929d28859d378cc1c84f3439dbe75"
+SRC_URI[md5sum] = "6922a3e2228de2f0e78ff25398ccf8df"
+SRC_URI[sha256sum] = "608beb7b71870b23309ba1da8ca828da0e4540f2b9bd981eb39e04f8b7fc678c"
inherit update-alternatives
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
` (3 preceding siblings ...)
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] mksh: upgrade 57 -> 58 Wang Mingyu
@ 2020-04-15 8:31 ` Wang Mingyu
2020-04-15 2:31 ` Khem Raj
4 siblings, 1 reply; 9+ messages in thread
From: Wang Mingyu @ 2020-04-15 8:31 UTC (permalink / raw)
To: openembedded-devel; +Cc: Wang Mingyu
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
---
.../{python3-cheetah_3.2.4.bb => python3-cheetah_3.2.5b1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-python/recipes-devtools/python/{python3-cheetah_3.2.4.bb => python3-cheetah_3.2.5b1.bb} (69%)
diff --git a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
similarity index 69%
rename from meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
rename to meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
index 05882d087..289b70298 100644
--- a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
+++ b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
@@ -10,5 +10,5 @@ RDEPENDS_${PN}_class-native = ""
BBCLASSEXTEND = "native nativesdk"
-SRC_URI[md5sum] = "8c0ac643263ffc3454fb321342284d0a"
-SRC_URI[sha256sum] = "caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b"
+SRC_URI[md5sum] = "5c07ebe4a31edf605a5ab2172bfc411c"
+SRC_URI[sha256sum] = "52f4abe6cb862fbc6047ac17dc3d7b4bb0faf82621fe911fefbb04b7a5d5a7ee"
--
2.17.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* 答复: [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3
2020-04-15 2:26 ` Khem Raj
@ 2020-04-20 8:45 ` Wang Mingyu
0 siblings, 0 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-20 8:45 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
Sorry, all future updates will be performed on the stable version, this problem will not be repeated.
-----邮件原件-----
发件人: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> 代表 Khem Raj
发送时间: 2020年4月15日 10:27
收件人: Wang, Mingyu/王 鸣瑜 <wangmy@cn.fujitsu.com>
抄送: openembeded-devel <openembedded-devel@lists.openembedded.org>
主题: Re: [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3
On Tue, Apr 14, 2020 at 6:50 PM Wang Mingyu <wangmy@cn.fujitsu.com> wrote:
>
> refresh the following patches:
> build_fixup.patch
> contrib.patch
>
I am a bit reluctant to take RC versions. Can you justify why we should upgrade to RC in this case ?
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
> .../proftpd/files/build_fixup.patch | 75 +++++++++----------
> .../proftpd/files/contrib.patch | 29 +++----
> .../{proftpd_1.3.6.bb => proftpd_1.3.7rc3.bb} | 4 +-
> 3 files changed, 52 insertions(+), 56 deletions(-) rename
> meta-networking/recipes-daemons/proftpd/{proftpd_1.3.6.bb =>
> proftpd_1.3.7rc3.bb} (97%)
>
> diff --git
> a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> index 9816d4d22..9f45a1c2f 100644
> --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch
> @@ -7,12 +7,17 @@ move pidfile to /var/run redefine PR_RUN_DIR as
> ${localstatedir}/run
>
> Signed-off-By: Armin Kuster <akuster808@gmail.com>
> +---
> + Make.rules.in | 6 +++---
> + Makefile.in | 6 ++----
> + configure | 4 ++--
> + configure.in | 4 ++--
> + 4 files changed, 9 insertions(+), 11 deletions(-)
>
> -
> -Index: proftpd-1.3.6/Make.rules.in
> -===================================================================
> ---- proftpd-1.3.6.orig/Make.rules.in
> -+++ proftpd-1.3.6/Make.rules.in
> +diff --git a/Make.rules.in b/Make.rules.in index a5028ac..ccd7807
> +100644
> +--- a/Make.rules.in
> ++++ b/Make.rules.in
> @@ -30,9 +30,9 @@ INSTALL=@INSTALL@
> INSTALL_STRIP=@INSTALL_STRIP@
> INSTALL_USER=@install_user@
> @@ -26,10 +31,10 @@ Index: proftpd-1.3.6/Make.rules.in
>
> RM=rm -f
> SHELL=@CONFIG_SHELL@
> -Index: proftpd-1.3.6/Makefile.in
> -===================================================================
> ---- proftpd-1.3.6.orig/Makefile.in
> -+++ proftpd-1.3.6/Makefile.in
> +diff --git a/Makefile.in b/Makefile.in index abacc9f..be22353 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> @@ -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:
> @if [ ! -d $@ ]; then \
> @@ -38,19 +43,19 @@ Index: proftpd-1.3.6/Makefile.in
> chmod 0755 $@; \
> fi
>
> -@@ -115,7 +114,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
> +@@ -115,7 +114,6 @@ install-proftpd: proftpd$(EXEEXT)
> +$(DESTDIR)$(includedir) $(DESTDIR)$(localstate
> rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
> fi
> - ln -s 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
> -@@ -152,11 +150,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
> - $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
> - $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop
> - $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
> -- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
> +@@ -152,11 +150,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 src/prxs $(DESTDIR)$(bindir)/prxs
>
> install-conf: $(DESTDIR)$(sysconfdir) @@ -60,11 +65,11 @@ Index:
> proftpd-1.3.6/Makefile.in
> $(top_srcdir)/sample-configurations/basic.conf \
> $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
> fi
> -Index: proftpd-1.3.6/configure
> -===================================================================
> ---- proftpd-1.3.6.orig/configure
> -+++ proftpd-1.3.6/configure
> -@@ -41777,7 +41777,7 @@ _ACEOF
> +diff --git a/configure b/configure
> +index 033f12f..242d18b 100755
> +--- a/configure
> ++++ b/configure
> +@@ -42308,7 +42308,7 @@ _ACEOF
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -73,7 +78,7 @@ Index: proftpd-1.3.6/configure
> _ACEOF
>
>
> -@@ -41787,7 +41787,7 @@ _ACEOF
> +@@ -42318,7 +42318,7 @@ _ACEOF
>
>
> cat >>confdefs.h <<_ACEOF
> @@ -82,11 +87,11 @@ Index: proftpd-1.3.6/configure
> _ACEOF
>
>
> -Index: proftpd-1.3.6/configure.in
> -===================================================================
> ---- proftpd-1.3.6.orig/configure.in
> -+++ proftpd-1.3.6/configure.in
> -@@ -3833,8 +3833,8 @@ locale_dir="`eval echo ${locale_dir}`"
> +diff --git a/configure.in b/configure.in index a4affa9..5449060
> +100644
> +--- a/configure.in
> ++++ b/configure.in
> +@@ -3956,8 +3956,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]) @@ -97,16 +102,6 @@ Index:
> proftpd-1.3.6/configure.in
>
> prefix="$pr_saved_prefix"
> exec_prefix="$pr_saved_exec_prefix"
> -Index: proftpd-1.3.6/lib/libcap/Makefile
> -===================================================================
> ---- proftpd-1.3.6.orig/lib/libcap/Makefile
> -+++ proftpd-1.3.6/lib/libcap/Makefile
> -@@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
> - all: $(LIBNAME)
> -
> - _makenames: _makenames.c cap_names.sed
> -- $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
> -+ $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@
> -
> - cap_names.h: _makenames
> - ./_makenames > cap_names.h
> +--
> +2.17.1
> +
> diff --git
> a/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> index 7e2a8e3ce..e4ff539de 100644
> --- a/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> +++ b/meta-networking/recipes-daemons/proftpd/files/contrib.patch
> @@ -6,37 +6,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(-)
> + Makefile.in | 2 +-
> + contrib/Makefile.in | 7 ++++---
> + 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile.in b/Makefile.in -index 5b2e683..ee72fe1 100644
> +index 3f325e5..abacc9f 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> -@@ -120,7 +120,7 @@ install-modules: $(DESTDIR)$(libexecdir)
> $(DESTDIR)$(sysconfdir)
> +@@ -145,7 +145,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
> + $(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
> 5bcc038..51d248c 100644
> +index d1a31af..865a6ff 100644
> --- a/contrib/Makefile.in
> +++ b/contrib/Makefile.in
> -@@ -18,6 +18,6 @@ Makefile: Makefile.in ../config.status
> +@@ -17,6 +17,7 @@ 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) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpasswd $(DESTDIR)$(bindir)/ftpasswd
> +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/ftpmail $(DESTDIR)$(bindir)/ftpmail
> +- $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(srcdir)/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
> +2.17.1
>
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
> b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> similarity index 97%
> rename from meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
> rename to meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> index d5bbdd374..10a9219d1 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.6.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7rc3.bb
> @@ -13,8 +13,8 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
> file://build_fixup.patch \
> file://proftpd.service \
> "
> -iSRC_URI[md5sum] = "13270911c42aac842435f18205546a1b"
> -SRC_URI[sha256sum] = "91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf"
> +SRC_URI[md5sum] = "2492bed101f2dd798453b389370dadb1"
> +SRC_URI[sha256sum] = "ae06a9da10165407cc525966cf4704b3b54295957fe42a234af52944815dc9ee"
>
> inherit autotools-brokensep useradd update-rc.d systemd
> multilib_script
>
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* 答复: [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1
2020-04-15 2:31 ` Khem Raj
@ 2020-04-20 8:47 ` Wang Mingyu
0 siblings, 0 replies; 9+ messages in thread
From: Wang Mingyu @ 2020-04-20 8:47 UTC (permalink / raw)
To: Khem Raj; +Cc: openembeded-devel
Sorry, all future updates will be performed on the stable version, this problem will not be repeated.
-----邮件原件-----
发件人: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> 代表 Khem Raj
发送时间: 2020年4月15日 10:31
收件人: Wang, Mingyu/王 鸣瑜 <wangmy@cn.fujitsu.com>
抄送: openembeded-devel <openembedded-devel@lists.openembedded.org>
主题: Re: [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1
this is also a pre-release. perhaps we should wait until final release.
On Tue, Apr 14, 2020 at 6:51 PM Wang Mingyu <wangmy@cn.fujitsu.com> wrote:
>
> Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
> ---
> .../{python3-cheetah_3.2.4.bb => python3-cheetah_3.2.5b1.bb} | 4
> ++--
> 1 file changed, 2 insertions(+), 2 deletions(-) rename
> meta-python/recipes-devtools/python/{python3-cheetah_3.2.4.bb =>
> python3-cheetah_3.2.5b1.bb} (69%)
>
> diff --git
> a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
> b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> similarity index 69%
> rename from
> meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
> rename to
> meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> index 05882d087..289b70298 100644
> --- a/meta-python/recipes-devtools/python/python3-cheetah_3.2.4.bb
> +++ b/meta-python/recipes-devtools/python/python3-cheetah_3.2.5b1.bb
> @@ -10,5 +10,5 @@ RDEPENDS_${PN}_class-native = ""
>
> BBCLASSEXTEND = "native nativesdk"
>
> -SRC_URI[md5sum] = "8c0ac643263ffc3454fb321342284d0a"
> -SRC_URI[sha256sum] = "caabb9c22961a3413ac85cd1e5525ec9ca80daeba6555f4f60802b6c256e252b"
> +SRC_URI[md5sum] = "5c07ebe4a31edf605a5ab2172bfc411c"
> +SRC_URI[sha256sum] = "52f4abe6cb862fbc6047ac17dc3d7b4bb0faf82621fe911fefbb04b7a5d5a7ee"
> --
> 2.17.1
>
>
>
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-04-20 8:47 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-15 8:31 [oe] [meta-networking][PATCH] proftpd: upgrade 1.3.6 -> 1.3.7rc3 Wang Mingyu
2020-04-15 2:26 ` Khem Raj
2020-04-20 8:45 ` 答复: " Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] cpuid: upgrade 20200203 -> 20200211 Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe][PATCH] libdvdread: upgrade 6.1.0 -> 6.1.1 Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-oe] [PATCH] mksh: upgrade 57 -> 58 Wang Mingyu
2020-04-15 8:31 ` [oe] [meta-python] [PATCH] python3-cheetah: upgrade 3.2.4 -> 3.2.5b1 Wang Mingyu
2020-04-15 2:31 ` Khem Raj
2020-04-20 8:47 ` 答复: " Wang Mingyu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.