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 50e06e54c46b1f68bc9c50bbdf422400b1b5e5cb (commit) via 9dd83b81c40191951329c560a6773c33664960f2 (commit) via d5a5418a0392b8bc47c02aee30b485d66900de50 (commit) via 28792af2436c86c7e36b6227cd203a50baeea343 (commit) via 0dc9b7936ead5f149e471cd130e28a8f3dfbb441 (commit) via 27fc7c09b11e93855d003d6dcbbcbfdb34e7b63b (commit) via 39040e602d1cc30d1d66281da2a1a2ed81def133 (commit) via 561e48c0512afba5469cec8bda220e1dde90ea3c (commit) via d743d386727c550888e8909bc51ef5d12a6a2828 (commit) via 01f8c3ee6f8d105b080ea4dd097a29029ffe743a (commit) via 155dc0cb0881d34b1d95307444cd4a99abf47061 (commit) via 0ea78d2cf515d36ad6f332fb76f0a8f0632379f0 (commit) via e96c88aa8f9f2859d3bc3b35ec353a3d1bce2a6c (commit) via 53057fa1b2ede79fbc895f8aef5f76eaa556bd4b (commit) via 37aea47acd4c8e879c9740e694f5e034f43fb647 (commit) via a7d884bb20b3eacee1c3673945ef4bf5481e173f (commit) from 89c1bf358652b9518e8104285c58cc8305c62cae (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 50e06e54c46b1f68bc9c50bbdf422400b1b5e5cb Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 11 17:04:29 2023 +0000
libdb: Do not strip during build time
We need the debug symbols for our hardening checks and anyway will strip them later for the debuginfo packages.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9dd83b81c40191951329c560a6773c33664960f2 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 11 16:59:48 2023 +0000
cups: Enable building debug symbols during build time
We need those for our hardening checks and to create the related debuginfo packages.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d5a5418a0392b8bc47c02aee30b485d66900de50 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Mar 11 16:56:01 2023 +0000
ncurses: Avoid stripping the symbols from binaries
Do not strip any symbols from the binaries during build time. We need those for our hardening checks and will do the stripping for the debuginfo packages afterwards.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 28792af2436c86c7e36b6227cd203a50baeea343 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 11 11:41:16 2023 +0000
mc: Proper harden consaver binary
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0dc9b7936ead5f149e471cd130e28a8f3dfbb441 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 11 11:39:50 2023 +0000
mc: Patch/Drop python 2 based helper scripts
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 27fc7c09b11e93855d003d6dcbbcbfdb34e7b63b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:50:42 2023 +0000
libnl: Drop package
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 39040e602d1cc30d1d66281da2a1a2ed81def133 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:50:13 2023 +0000
iw: Link agains libnl3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 561e48c0512afba5469cec8bda220e1dde90ea3c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:49:50 2023 +0000
iproute2: Does not longer depend on libnl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d743d386727c550888e8909bc51ef5d12a6a2828 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:49:26 2023 +0000
libpcap: Does not longer depend on libnl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 01f8c3ee6f8d105b080ea4dd097a29029ffe743a Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:48:58 2023 +0000
libvirt: Does not longer depend on libnl
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 155dc0cb0881d34b1d95307444cd4a99abf47061 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:34:38 2023 +0000
libcap: Fix hardening
* Add CFLAGS to workaround a compiler bug with affects SSP in some cases.
* Add patch to proper use our CFLAGS
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 0ea78d2cf515d36ad6f332fb76f0a8f0632379f0 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:31:59 2023 +0000
e2fsprogs: Fix hardening
Add CFLAGS to workaround a compiler bug with affects SSP in some cases.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e96c88aa8f9f2859d3bc3b35ec353a3d1bce2a6c Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Mar 10 16:30:01 2023 +0000
bzip2: Respect CFLAGS and LDFLAGS
Add two patches to proper use our CFLAGS and LDFLAGS.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 53057fa1b2ede79fbc895f8aef5f76eaa556bd4b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 9 13:24:17 2023 +0000
avahi: Compile with -fstack-protector-all
We have to use the configure flag to disable the stack-protector to avoid overwriting our own stack protector flags.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit 37aea47acd4c8e879c9740e694f5e034f43fb647 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 9 12:45:32 2023 +0000
perl: Force perl to build with -fstack-protector-all
Forcing perl to build with -fstack-protector-all and not with -fstack-protector-strong.
More details could be found here: https://git.ipfire.org/?p=pakfire.git;a=commit;h=f1153a857affb461de71d0c7e62...
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
commit a7d884bb20b3eacee1c3673945ef4bf5481e173f Author: Stefan Schantl stefan.schantl@ipfire.org Date: Thu Mar 9 12:43:56 2023 +0000
perl: Fix broken dependency for perl-core meta package
The perl-DynaLoader package has been moved back into main perl package.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org
-----------------------------------------------------------------------
Summary of changes: avahi/avahi.nm | 4 +- bzip2/bzip2.nm | 2 +- .../{bzip2-saneso.patch => 01-bzip2-saneso.patch} | 0 .../{bzip2-saneso.patch => 02-bzip2-cflags.patch} | 8 +-- bzip2/patches/03-bzip2-ldflags.patch | 36 +++++++++++ cups/cups.nm | 5 +- e2fsprogs/e2fsprogs.nm | 7 ++- iproute2/iproute2.nm | 3 +- iw/iw.nm | 4 +- libcap/libcap.nm | 6 +- libcap/patches/libcap-cflags.patch | 12 ++++ libdb/libdb.nm | 5 +- libnl/libnl.nm | 32 ---------- libpcap/libpcap.nm | 3 +- libvirt/libvirt.nm | 3 +- mc/mc.nm | 13 +++- mc/patches/mc-python3.patch | 69 ++++++++++++++++++++++ ncurses/ncurses.nm | 5 +- perl/perl.nm | 7 ++- 19 files changed, 165 insertions(+), 59 deletions(-) copy bzip2/patches/{bzip2-saneso.patch => 01-bzip2-saneso.patch} (100%) rename bzip2/patches/{bzip2-saneso.patch => 02-bzip2-cflags.patch} (51%) create mode 100644 bzip2/patches/03-bzip2-ldflags.patch create mode 100644 libcap/patches/libcap-cflags.patch delete mode 100644 libnl/libnl.nm create mode 100644 mc/patches/mc-python3.patch
Difference in files: diff --git a/avahi/avahi.nm b/avahi/avahi.nm index 295cad203..0a8f24686 100644 --- a/avahi/avahi.nm +++ b/avahi/avahi.nm @@ -5,7 +5,7 @@
name = avahi version = 0.8 -release = 1 +release = 2
groups = Networking/Zeroconf url = https://avahi.org/ @@ -56,7 +56,9 @@ build --disable-gtk \ --disable-gtk3 \ --disable-mono \ + --disable-stack-protector \ PYTHON=%{python3} + end
packages diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm index adab75658..2b0e12cc8 100644 --- a/bzip2/bzip2.nm +++ b/bzip2/bzip2.nm @@ -5,7 +5,7 @@
name = bzip2 version = 1.0.8 -release = 1 +release = 2
groups = Applications/Compression url = https://sourceware.org/bzip2/ diff --git a/bzip2/patches/bzip2-saneso.patch b/bzip2/patches/01-bzip2-saneso.patch similarity index 100% rename from bzip2/patches/bzip2-saneso.patch rename to bzip2/patches/01-bzip2-saneso.patch diff --git a/bzip2/patches/02-bzip2-cflags.patch b/bzip2/patches/02-bzip2-cflags.patch new file mode 100644 index 000000000..992abbf08 --- /dev/null +++ b/bzip2/patches/02-bzip2-cflags.patch @@ -0,0 +1,12 @@ +diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so +--- bzip2-1.0.6/Makefile-libbz2_so.pom 2010-09-22 10:36:24.000000000 +0200 ++++ bzip2-1.0.6/Makefile-libbz2_so 2010-09-22 10:36:58.000000000 +0200 +@@ -35,7 +35,7 @@ OBJS= blocksort.o \ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 diff --git a/bzip2/patches/03-bzip2-ldflags.patch b/bzip2/patches/03-bzip2-ldflags.patch new file mode 100644 index 000000000..53c6ecc18 --- /dev/null +++ b/bzip2/patches/03-bzip2-ldflags.patch @@ -0,0 +1,36 @@ +diff -up bzip2-1.0.6/Makefile.jx bzip2-1.0.6/Makefile +--- bzip2-1.0.6/Makefile.jx 2010-09-10 18:46:02.000000000 -0400 ++++ bzip2-1.0.6/Makefile 2015-08-14 13:04:33.891504131 -0400 +@@ -18,10 +18,6 @@ SHELL=/bin/sh + CC=gcc + AR=ar + RANLIB=ranlib +-LDFLAGS= +- +-BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) + + # Where you want it installed when you do 'make install' + PREFIX=/usr/local +diff -up bzip2-1.0.6/Makefile-libbz2_so.jx bzip2-1.0.6/Makefile-libbz2_so +--- bzip2-1.0.6/Makefile-libbz2_so.jx 2015-08-14 13:04:33.885503955 -0400 ++++ bzip2-1.0.6/Makefile-libbz2_so 2015-08-14 13:06:52.554581179 -0400 +@@ -24,7 +24,6 @@ + SHELL=/bin/sh + CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) + + OBJS= blocksort.o \ + huffman.o \ +@@ -35,8 +34,8 @@ OBJS= blocksort.o \ + bzlib.o + + all: $(OBJS) +- $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) +- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.8 $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.8 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.8 libbz2.so.1.0 + diff --git a/cups/cups.nm b/cups/cups.nm index 43b3c782b..d038d41c8 100644 --- a/cups/cups.nm +++ b/cups/cups.nm @@ -5,7 +5,7 @@
name = cups version = 2.3.6 -release = 1 +release = 2
groups = Applications/Printing url = https://cups.org/software.php @@ -48,10 +48,9 @@ build --with-log-file-perm=0600 \ --with-docdir=%{datadir}/%{name}/www \ --with-dbusdir=%{sysconfdir}/dbus-1 \ - --enable-pie \ + --enable-debug \ --enable-relro \ --enable-avahi \ - --enable-lspp \ --enable-threads \ --enable-gnutls \ --enable-webif \ diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm index b5e1632db..5041e8bd0 100644 --- a/e2fsprogs/e2fsprogs.nm +++ b/e2fsprogs/e2fsprogs.nm @@ -5,7 +5,7 @@
name = e2fsprogs version = 1.46.5 -release = 1 +release = 2
groups = System/Filesystems url = https://e2fsprogs.sourceforge.net/ @@ -31,7 +31,10 @@ build mkdir -pv %{DIR_APP}/build end
- CFLAGS += -fno-strict-aliasing + CFLAGS += \ + -fno-strict-aliasing \ + -fno-builtin-exit \ + -D__noreturn__=
configure_options += \ --with-root-prefix="" \ diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 965d1cf3f..20df759ae 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -5,7 +5,7 @@
name = iproute2 version = 6.0.0 -release = 3 +release = 4
groups = Networking/Tools url = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git @@ -28,7 +28,6 @@ build flex libcap-devel libmnl-devel - libnl-devel libtirpc-devel end
diff --git a/iw/iw.nm b/iw/iw.nm index b99d54986..e70dec401 100644 --- a/iw/iw.nm +++ b/iw/iw.nm @@ -5,7 +5,7 @@
name = iw version = 5.9 -release = 1 +release = 2
groups = System/Base url = https://www.linuxwireless.org/en/users/Documentation/iw @@ -23,7 +23,7 @@ sources = %{thisapp}.tar.xz
build requires - libnl-devel + libnl3-devel end end
diff --git a/libcap/libcap.nm b/libcap/libcap.nm index 024a458f0..1b3f27d0e 100644 --- a/libcap/libcap.nm +++ b/libcap/libcap.nm @@ -5,7 +5,7 @@
name = libcap version = 2.66 -release = 1 +release = 2
groups = System/Libraries url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ @@ -28,6 +28,10 @@ build /bin/ping end
+ CFLAGS += \ + -fno-builtin-exit \ + -D__noreturn__= + build make DYNAMIC=yes LIBATTR=yes \ CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}" diff --git a/libcap/patches/libcap-cflags.patch b/libcap/patches/libcap-cflags.patch new file mode 100644 index 000000000..d77eefbc6 --- /dev/null +++ b/libcap/patches/libcap-cflags.patch @@ -0,0 +1,12 @@ +diff -Nur a/Make.Rules b/Make.Rules +--- a/Make.Rules 2022-09-24 20:41:21.000000000 +0000 ++++ b/Make.Rules 2023-03-10 16:22:35.826124239 +0000 +@@ -80,7 +80,7 @@ + WARNINGS=-Wall -Wwrite-strings -Wpointer-arith -Wcast-qual -Wcast-align \ + -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs \ + -Winline -Wshadow -Wunreachable-code +-COPTS ?= -O2 ++COPTS ?= $(CFLAGS) + CFLAGS ?= $(COPTS) $(DEBUG) + CFLAGS += $(WARNINGS) + CPPFLAGS += -Dlinux $(DEFINES) $(LIBCAP_INCLUDES) diff --git a/libdb/libdb.nm b/libdb/libdb.nm index 7b7a3a940..ed20767cd 100644 --- a/libdb/libdb.nm +++ b/libdb/libdb.nm @@ -8,7 +8,7 @@ version_major = 6 version_minor = 1 version_patch = 26 version = %{version_major}.%{version_minor}.%{version_patch} -release = 2 +release = 3 thisapp = db-%{version}
soversion = %{version_major}.%{version_minor} @@ -65,7 +65,8 @@ build --enable-cxx \ --enable-sql \ --disable-static \ - --disable-rpath + --disable-rpath \ + STRIP=:
install_cmds # Remove RPATH in all binaries. diff --git a/libnl/libnl.nm b/libnl/libnl.nm deleted file mode 100644 index 4bf29cbef..000000000 --- a/libnl/libnl.nm +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libnl -version = 1.1.4 -release = 1 - -groups = Development/Libraries -url = https://www.infradead.org/~tgr/libnl/ -license = LGPLv2 -summary = Convenience library for kernel netlink sockets - -description - This package contains a convenience library to simplify using the \ - Linux kernel's netlink sockets interface for network manipulation. -end - -source_dl = https://www.infradead.org/~tgr/libnl/files/ - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libpcap/libpcap.nm b/libpcap/libpcap.nm index d61c08875..c8a676ff3 100644 --- a/libpcap/libpcap.nm +++ b/libpcap/libpcap.nm @@ -5,7 +5,7 @@
name = libpcap version = 1.10.1 -release = 1 +release = 2
groups = System/Libraries url = https://www.tcpdump.org/ @@ -28,7 +28,6 @@ build requires bison flex - libnl-devel end end
diff --git a/libvirt/libvirt.nm b/libvirt/libvirt.nm index bad9beaa9..2fca99bf4 100644 --- a/libvirt/libvirt.nm +++ b/libvirt/libvirt.nm @@ -5,7 +5,7 @@
name = libvirt version = 8.10.0 -release = 2 +release = 3
maintainer = Jonatan Schlag jonatan.schlag@ipfire.org groups = Applications/Virtualization @@ -34,7 +34,6 @@ build libcap-ng-devel libcurl-devel libgcrypt-devel - libnl-devel libdevmapper-devel libnl3-devel libpcap-devel diff --git a/mc/mc.nm b/mc/mc.nm index 70f60246a..1fe8161a6 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -5,7 +5,7 @@
name = mc version = 4.8.29 -release = 1 +release = 3
groups = Applications/System url = https://midnight-commander.org @@ -40,8 +40,19 @@ build --enable-charset \ --disable-rpath
+ configure_cmds + # Add some additional CFLAGS to the consaver Makefile to proper + # harden the binary. + sed -i '/^CFLAGS =/ s/$/ -fno-builtin-exit -D__noreturn__=/' \ + src/consaver/Makefile + end + install_cmds + # Fix permissions chmod 1755 %{BUILDROOT}/usr/lib/mc/cons.saver + + # Remove python2 based helper script for amazon S3. + rm -rvf %{BUILDROOT}/usr/lib/mc/extfs.d/s3+ end end
diff --git a/mc/patches/mc-python3.patch b/mc/patches/mc-python3.patch new file mode 100644 index 000000000..ce066100b --- /dev/null +++ b/mc/patches/mc-python3.patch @@ -0,0 +1,69 @@ +--- a/src/vfs/extfs/helpers/uc1541 ++++ b/src/vfs/extfs/helpers/uc1541 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + UC1541 Virtual filesystem + +--- a/src/vfs/extfs/helpers/s3+.in (original) ++++ b/src/vfs/extfs/helpers/s3+.in (refactored) +@@ -153,16 +153,16 @@ + Propagates exception safely. + """ + from threading import Thread +- import Queue ++ import queue + + items = list(iterable) + nitems = len(items) + if nitems < 2: +- return map(fun, items) ++ return list(map(fun, items)) + + # Create and fill input queue +- input = Queue.Queue() +- output = Queue.Queue() ++ input = queue.Queue() ++ output = queue.Queue() + + for i,item in enumerate(items): + input.put( (i,item) ) +@@ -181,7 +181,7 @@ + output.put( (i,result) ) + except: + output.put( (None,sys.exc_info()) ) +- except Queue.Empty: ++ except queue.Empty: + return + + # Start threads +@@ -196,8 +196,8 @@ + try: + i,res = output.get() + if i == None: +- raise res[0],res[1],res[2] +- except Queue.Empty: ++ raise res[0](res[1]).with_traceback(res[2]) ++ except queue.Empty: + break + ret.append(res) + +@@ -241,7 +241,7 @@ + b = s3.get_bucket(name, validate=False) + b.get_location() # just to raise an exception on error + return b +- except boto.exception.S3ResponseError, e: ++ except boto.exception.S3ResponseError as e: + # Seems this is the only proper way to switch to the bucket's region. + # Requesting of the default region for "?location" does not work unfortunately. + m = re.search(r'<Region>(.*?)</Region>', e.body) +@@ -340,7 +340,7 @@ + expr = re.compile(r'^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}).\d{3}Z$') + def convDate(awsdatetime): + m = expr.match(awsdatetime) +- ye,mo,da,ho,mi,se = map(int,m.groups()) ++ ye,mo,da,ho,mi,se = list(map(int,m.groups())) + + dt = datetime.datetime(ye,mo,da,ho,mi,se, tzinfo=pytz.utc) + return dt.astimezone(tz).strftime('%m-%d-%Y %H:%M') diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index f4a424d8e..9dc981af6 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@
name = ncurses version = 6.3 -release = 2 +release = 3 thisapp = %{name}-%{version}
groups = System/Base @@ -39,7 +39,8 @@ build --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ --enable-overwrite \ --enable-pc-files \ - --with-termlib=tinfo + --with-termlib=tinfo \ + --disable-stripping
export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig
diff --git a/perl/perl.nm b/perl/perl.nm index 18c4c65a2..3a7bad525 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -10,7 +10,7 @@ ver_plevel = 0 version = %{ver_major}.%{ver_minor}.%{ver_plevel}
# Never reset release in this package, just increase. -release = 2.1 +release = 3
thisver = %{version}-%{_release}
@@ -126,6 +126,10 @@ build rm -rf cpan/Compress-Raw-Bzip2/bzip2-src sed -i '/(bzip2|zlib)-src/d' MANIFEST
+ # Force the configure script to check if -fstack-protector-all is supported + # and set this afterwards. (Otherwise -fstack-protector-strong would be used) + sed -i "s/stack-protector-strong/stack-protector-all/g" Configure + sh ./Configure %{configure_options}
make %{PARALLELISMFLAGS} @@ -4414,7 +4418,6 @@ packages perl-Digest-SHA perl-doc perl-Dumpvalue - perl-DynaLoader perl-Encode perl-encoding perl-encoding-warnings
hooks/post-receive -- IPFire 3.x development tree