This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 55586be216691ee0972da690db8229d7e6cddb96 (commit) via ed04629301dd32437d5ce0cde4d996ad2fc5fd99 (commit) via 402c55826cc720245499f152f176d4c202c63fa9 (commit) via 2b084788ed858bde6ffe4a5186adbe565632c0ff (commit) from 4f2a9491d8ca8ee3c472cf0a698df035cf0f3bb2 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 55586be216691ee0972da690db8229d7e6cddb96 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 16 16:45:31 2016 -0400
kernel: Enable aarch64 kernel
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ed04629301dd32437d5ce0cde4d996ad2fc5fd99 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 16 16:44:23 2016 -0400
ustr: Import patches I forgot to commit
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 402c55826cc720245499f152f176d4c202c63fa9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 16 16:43:41 2016 -0400
slang: Import patches I forgot to commit earlier
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2b084788ed858bde6ffe4a5186adbe565632c0ff Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Oct 16 16:28:47 2016 -0400
pakfire: Update to 0.9.27
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: kernel/kernel.nm | 10 +- pakfire/pakfire.nm | 9 +- .../0001-CFLAGS-Enable-more-hardening.patch | 26 ----- pakfire/patches/0001-Fix-database-conversion.patch | 27 ----- pakfire/patches/0002-pakfire-perl_version.patch | 21 ---- .../slang-fix-the-iconv-existence-checking.patch | 125 +++++++++++++++++++++ slang/slang.nm | 2 +- ustr/patches/c99-inline.patch | 30 +++++ ustr/ustr.nm | 2 +- 9 files changed, 169 insertions(+), 83 deletions(-) delete mode 100644 pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch delete mode 100644 pakfire/patches/0001-Fix-database-conversion.patch delete mode 100644 pakfire/patches/0002-pakfire-perl_version.patch create mode 100644 slang/patches/slang-fix-the-iconv-existence-checking.patch create mode 100644 ustr/patches/c99-inline.patch
Difference in files: diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 4a3ac98..b459d88 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@
name = kernel version = 4.4.19 -release = 1 +release = 2 thisapp = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org @@ -63,8 +63,9 @@ build # A list of kernels to build. kernels =
- # Arguments that are passed to the kernel build command. - kernel_build_flags = + # Arguments that are passed to the kernel build command + # Clearning any host CFLAGS or LDFLAGS for kernel build + kernel_build_flags = CFLAGS= LDFLAGS=
kernel_arch = %{DISTRO_PLATFORM} kernel_target = bzImage @@ -75,8 +76,7 @@ build end
if "%{DISTRO_ARCH}" == "aarch64" - # Disable for now because it won't compile - build_kernel_default = 0 + build_kernel_default = 1
kernel_arch = arm64 kernel_target = Image.gz diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 21e2bfa..ffd9cbc 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pakfire -version = 0.9.26 -release = 3.1 +version = 0.9.27 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging @@ -55,6 +55,11 @@ build # Remove all example repository definitions. # Those will be solely provided by system-release. rm -rfv %{BUILDROOT}%{sysconfdir}/pakfire/repos/* + + mkdir -pv %{BUILDROOT}%{datadir}/pakfire + for i in $(find %{datadir}/automake-* -name config.guess -or -name config.sub); do + cp -vf ${i} %{BUILDROOT}%{datadir}/pakfire/ + done end end
diff --git a/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch b/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch deleted file mode 100644 index bab8cb5..0000000 --- a/pakfire/patches/0001-CFLAGS-Enable-more-hardening.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 664591620ddc73ac6838c6ed152c2b3c4233d609 -Author: Michael Tremer michael.tremer@ipfire.org -Date: Tue Sep 16 15:49:25 2014 +0200 - - CFLAGS: Enable more hardening - - -fstack-protector-strong is available since GCC 4.9 - - -D_FORTIFY_SOURCE=2 is automatically enabled in IPFire since - GCC 4.9 and when optimization is enabled (e.g. -O2). - -diff --git a/macros/cflags.macro b/macros/cflags.macro -index a2c583c..52a069a 100644 ---- a/macros/cflags.macro -+++ b/macros/cflags.macro -@@ -1,7 +1,8 @@ - - # Export CFLAGS + CXXFLAGS --GLOBAL_CFLAGS = -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC --GLOBAL_CFLAGS += -fstack-protector-all --param=ssp-buffer-size=4 -+GLOBAL_CFLAGS = -O2 -g -pipe -Wall -Werror=format-security -+GLOBAL_CFLAGS += -fexceptions -fPIC -fstack-protector-strong --param=ssp-buffer-size=4 -+GLOBAL_CFLAGS += -grecord-gcc-switches - - CFLAGS_i686 = -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables - CFLAGS_x86_64 = -m64 -mtune=generic diff --git a/pakfire/patches/0001-Fix-database-conversion.patch b/pakfire/patches/0001-Fix-database-conversion.patch deleted file mode 100644 index 3ba0558..0000000 --- a/pakfire/patches/0001-Fix-database-conversion.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 32468054fe6aa6d181388252ac4c3f6286dfacf1 Mon Sep 17 00:00:00 2001 -From: Michael Tremer michael.tremer@ipfire.org -Date: Wed, 25 Sep 2013 00:51:36 +0100 -Subject: [PATCH] Fix database conversion. - -The new dependencies table was not correctly generated -from older databases, which is fixed in this patch. ---- - src/pakfire/repository/database.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/pakfire/repository/database.py b/src/pakfire/repository/database.py -index d22bdb5..379ae1c 100644 ---- a/src/pakfire/repository/database.py -+++ b/src/pakfire/repository/database.py -@@ -281,7 +281,7 @@ class DatabaseLocal(Database): - - for type, deps in dependencies: - c.executemany("INSERT INTO dependencies(pkg, type, dependency) VALUES(?, ?, ?)", -- ((pkg_id, type, d) for d in deps)) -+ ((pkg_id, type, d) for d in deps.splitlines())) - - c.executescript(""" - CREATE TABLE packages_( --- -1.8.3.1 - diff --git a/pakfire/patches/0002-pakfire-perl_version.patch b/pakfire/patches/0002-pakfire-perl_version.patch deleted file mode 100644 index 6b5faea..0000000 --- a/pakfire/patches/0002-pakfire-perl_version.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 582d5734cfcd11de7563366f9788ea72803277e6 -Author: Stefan Schantl stefan.schantl@ipfire.org -Date: Sat Apr 4 15:33:58 2015 +0200 - - perl.macro: Add "perl_version". - - This variable is used to store the current used perl version, which - will be used in various external perl modules to track API dependencies. - -diff --git a/macros/perl.macro b/macros/perl.macro -index b29e028..aa8fa81 100644 ---- a/macros/perl.macro -+++ b/macros/perl.macro -@@ -7,6 +7,7 @@ perl_vendorarch = %(eval "$(%{perl} -V:installvendorarch)"; echo ${installvendor - perl_vendorlib = %(eval "$(%{perl} -V:installvendorlib)"; echo ${installvendorlib}) - perl_archlib = %(eval "$(%{perl} -V:installarchlib)"; echo ${installarchlib}) - perl_privlib = %(eval "$(%{perl} -V:installprivlib)"; echo ${installprivlib}) -+perl_version = %(eval "$(%{perl} -V:version)"; echo ${version}) - - perl_all_paths = {%{perl_vendorarch},%{perl_vendorlib},%{perl_archlib},%{perl_privlib}} - diff --git a/slang/patches/slang-fix-the-iconv-existence-checking.patch b/slang/patches/slang-fix-the-iconv-existence-checking.patch new file mode 100644 index 0000000..850551e --- /dev/null +++ b/slang/patches/slang-fix-the-iconv-existence-checking.patch @@ -0,0 +1,125 @@ +From 4588f4a0287787788eb86fb16f326cbaa7454e1d Mon Sep 17 00:00:00 2001 +From: Zheng Junling zhengjunling@huawei.com +Date: Mon, 16 Jun 2014 12:51:25 +0000 +Subject: [PATCH] slang: fix the iconv existence checking + +When checking whether there is iconv, the configure file always check +the host env. + +Now we make it working properly by adding correct prefix for cross- +compiling environment. + +When enabling iconv-module, we see a QA warning because rpaths hardcoded +into the build. And rpaths are not needed, so let's turn this off. + +This patch is generated by referencing the existing "fix-check-pcre" +patch. + +Upstream-Status: Inappropriate + +Signed-off-by: Zheng Junling zhengjunling@huawei.com +--- + configure | 72 +++++--------------------------------------------------------- + 1 file changed, 6 insertions(+), 66 deletions(-) + +diff --git a/configure b/configure +index fa395ff..7fa769c 100755 +--- a/configure ++++ b/configure +@@ -8259,6 +8259,7 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } + /usr/include/iconv,/usr/lib \ + /usr/iconv/include,/usr/iconv/lib \ + /usr/include,/usr/lib \ ++ /usr/include,/usr/lib64 \ + /opt/include/iconv,/opt/lib \ + /opt/iconv/include,/opt/iconv/lib \ + /opt/include,/opt/lib" +@@ -8289,14 +8290,14 @@ $as_echo_n "checking for the iconv library and header files ... " >&6; } + xincdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $1}'` + xlibdir=`echo $include_and_lib | tr ',' ' ' | awk '{print $2}'` + found=0 +- if test -r $xincdir/$xincfile ++ if test -r $PKG_CONFIG_SYSROOT_DIR/$xincdir/$xincfile + then + for E in $exts + do +- if test -r "$xlibdir/$xlibfile.$E" ++ if test -r "$PKG_CONFIG_SYSROOT_DIR/$xlibdir/$xlibfile.$E" + then +- jd_iconv_include_dir="$xincdir" +- jd_iconv_library_dir="$xlibdir" ++ jd_iconv_include_dir="$PKG_CONFIG_SYSROOT_DIR/$xincdir" ++ jd_iconv_library_dir="$PKG_CONFIG_SYSROOT_DIR/$xlibdir" + jd_with_iconv_library="yes" + found=1 + break +@@ -8201,68 +8201,7 @@ $as_echo "yes: $jd_iconv_library_dir and $jd_iconv_include_dir" >&6; } + then + ICONV_LIB="" + else +- +-if test "X$jd_iconv_library_dir" != "X" +-then +- if test "X$RPATH" = "X" +- then +- +-case "$host_os" in +- *linux*|*solaris* ) +- if test "X$GCC" = Xyes +- then +- if test "X$ac_R_nospace" = "Xno" +- then +- RPATH="-Wl,-R," +- else +- RPATH="-Wl,-R" +- fi +- else +- if test "X$ac_R_nospace" = "Xno" +- then +- RPATH="-R " +- else +- RPATH="-R" +- fi +- fi +- ;; +- *osf*|*openbsd*|*freebsd*) +- if test "X$GCC" = Xyes +- then +- RPATH="-Wl,-rpath," +- else +- RPATH="-rpath " +- fi +- ;; +- *netbsd*) +- if test "X$GCC" = Xyes +- then +- RPATH="-Wl,-R" +- fi +- ;; +-esac +- +- if test "X$RPATH" != "X" +- then +- RPATH="$RPATH$jd_iconv_library_dir" +- fi +- else +- _already_there=0 +- for X in `echo $RPATH | sed 's/:/ /g'` +- do +- if test "$X" = "$jd_iconv_library_dir" +- then +- _already_there=1 +- break +- fi +- done +- if test $_already_there = 0 +- then +- RPATH="$RPATH:$jd_iconv_library_dir" +- fi +- fi +-fi +- ++ RPATH="" + fi + + ICONV_INC=-I$jd_iconv_include_dir diff --git a/slang/slang.nm b/slang/slang.nm index 7e46ea0..c81a3e2 100644 --- a/slang/slang.nm +++ b/slang/slang.nm @@ -5,7 +5,7 @@
name = slang version = 2.3.0 -release = 2 +release = 2.1
groups = System/Libraries url = http://www.jedsoft.org/slang/ diff --git a/ustr/patches/c99-inline.patch b/ustr/patches/c99-inline.patch new file mode 100644 index 0000000..dfa021f --- /dev/null +++ b/ustr/patches/c99-inline.patch @@ -0,0 +1,30 @@ +diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h +--- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500 ++++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400 +@@ -113,17 +113,23 @@ + #endif + + #ifndef USTR_CONF_EI_PROTO /* external inline */ +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ ++ ! USTR_CONF_COMPILE_USE_INLINE + # define USTR_CONF_EI_PROTO static USTR__INLINE + # else + # define USTR_CONF_EI_PROTO extern + # endif + #endif + #ifndef USTR_CONF_II_PROTO /* implementation of inline */ +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ ++ ! USTR_CONF_COMPILE_USE_INLINE + # define USTR_CONF_II_PROTO static USTR__INLINE + # else +-# define USTR_CONF_II_PROTO extern inline ++# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__) ++# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__)) ++# else ++# define USTR_CONF_II_PROTO extern inline ++# endif + # endif + #endif + diff --git a/ustr/ustr.nm b/ustr/ustr.nm index 7db2a1e..9e12f8e 100644 --- a/ustr/ustr.nm +++ b/ustr/ustr.nm @@ -5,7 +5,7 @@
name = ustr version = 1.0.4 -release = 3 +release = 3.1
groups = System/Libraries url = http://www.and.org/ustr/
hooks/post-receive -- IPFire 3.x development tree