[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1
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 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1 (commit) via 7e3ccb3d00711c60aa47a6b3cfab96a6a343f9ad (commit) via 9599babe00ac3a7d06122305564f0beceb902187 (commit) via 961830966e5144bc3c823f8b68ae72997cf10823 (commit) via c18c21205a0a06b0b1eee5f9ed39a36190215b6e (commit) via 55c6e8e9326c7c70648b632b0b07efb0ce334881 (commit) via e43731e88e796ba24410fe23c6206a6da96fd41f (commit) via de837b147b7f7699a4ca11a664a133d72dac6a56 (commit) via 6e43bbbc9889302891280a3e6d44f36abdfad9fe (commit) via 309d4746a38124e4bc98580814605e188d94ee2a (commit) via 93b1d1994a15600fcc42fe6bbf16a7c08e7c434a (commit) via 123a329a16834a7bd8792ecd995b9218ddcda439 (commit) via 93852426c35dcb043508f507c1ce73009e14007f (commit) via fc7ba2cf7a7ced83c80cda7463d559b65a7760da (commit) via 7e4d32b44f98705275fde9fe2760ae44413c5d3c (commit) via 87ad095ed84f22415fec35a1c61a310feee8413b (commit) via fa70313a22a226b8dcb120a4a7d304e1c30e51a0 (commit) from 8be412d99b7f04e0b6c6544e91d0f498560dde7a (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 480cb5d36d29181f5a8f07aeb4e1786e087eb2d1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:57:52 2022 +0000
filesystem: Drop Python scriptlet
This is now being handled in Pakfire.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7e3ccb3d00711c60aa47a6b3cfab96a6a343f9ad Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:55:27 2022 +0000
sed: Update to 4.9
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9599babe00ac3a7d06122305564f0beceb902187 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:54:14 2022 +0000
tinc: Drop package
We currently don't support VPNs with tinc
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 961830966e5144bc3c823f8b68ae72997cf10823 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:51:53 2022 +0000
clamav: Update to 0.103.7
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c18c21205a0a06b0b1eee5f9ed39a36190215b6e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:49:10 2022 +0000
less: Update to 608
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 55c6e8e9326c7c70648b632b0b07efb0ce334881 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:48:56 2022 +0000
ncurses: Update to 6.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e43731e88e796ba24410fe23c6206a6da96fd41f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:48:23 2022 +0000
hostname: Update to 3.23
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit de837b147b7f7699a4ca11a664a133d72dac6a56 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:44:43 2022 +0000
patch: Update to 2.7.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6e43bbbc9889302891280a3e6d44f36abdfad9fe Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:38:22 2022 +0000
lzip: Update to 1.23
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 309d4746a38124e4bc98580814605e188d94ee2a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:34:34 2022 +0000
compat-openssl: This package replaces openssl-libs in older version
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 93b1d1994a15600fcc42fe6bbf16a7c08e7c434a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 16:32:57 2022 +0000
compat-ncurses: Update to 5.9
This might be a slightly older revision, but we just need this thing for now.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 123a329a16834a7bd8792ecd995b9218ddcda439 Author: Peter Müller peter.mueller@ipfire.org Date: Tue Dec 20 14:10:41 2022 +0000
openssl: Update to 3.0.7
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 93852426c35dcb043508f507c1ce73009e14007f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 14:04:18 2022 +0000
rpcsvc-proto: New package
This ships the glibc headers for RPC stuff.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fc7ba2cf7a7ced83c80cda7463d559b65a7760da Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 13:52:21 2022 +0000
iputils: Update to 20221126
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7e4d32b44f98705275fde9fe2760ae44413c5d3c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 20 13:51:55 2022 +0000
libidn2: New package
Required by iputils
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 87ad095ed84f22415fec35a1c61a310feee8413b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 19:08:34 2022 +0000
gzip: Update to 1.12
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fa70313a22a226b8dcb120a4a7d304e1c30e51a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Dec 19 19:00:24 2022 +0000
grep: Update to 3.8
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: clamav/clamav.nm | 14 +- compat-ncurses/compat-ncurses.nm | 27 +++- .../0001-Fix-errors-in-type-conversion.patch | 153 +++++++++++++++++++++ compat-openssl/compat-openssl.nm | 6 +- filesystem/filesystem.nm | 27 +--- grep/grep.nm | 10 +- gzip/gzip.nm | 14 +- hostname/hostname.nm | 22 ++- iputils/iputils.nm | 56 ++++---- iputils/patches/iputils-ipfire.patch | 37 ----- iputils/patches/iputils-tracepath-doc.patch | 19 --- less/less.nm | 11 +- libidn/libidn.nm => libidn2/libidn2.nm | 7 +- lzip/lzip.nm | 10 +- ncurses/ncurses.nm | 4 +- openssl/openssl.nm | 39 +----- patch/patch.nm | 10 +- rpcsvc-proto/rpcsvc-proto.nm | 36 +++++ sed/sed.nm | 18 +-- tinc/tinc.nm | 41 ------ 20 files changed, 292 insertions(+), 269 deletions(-) create mode 100644 compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch delete mode 100644 iputils/patches/iputils-ipfire.patch delete mode 100644 iputils/patches/iputils-tracepath-doc.patch copy libidn/libidn.nm => libidn2/libidn2.nm (90%) create mode 100644 rpcsvc-proto/rpcsvc-proto.nm delete mode 100644 tinc/tinc.nm
Difference in files: diff --git a/clamav/clamav.nm b/clamav/clamav.nm index 2f781ce71..d4548a94a 100644 --- a/clamav/clamav.nm +++ b/clamav/clamav.nm @@ -4,11 +4,11 @@ ###############################################################################
name = clamav -version = 0.101.4 +version = 0.103.7 release = 1
groups = System Environment/Daemons -url = http://www.clamav.net +url = https://www.clamav.net license = GPLv2 summary = A GPL virus scanner
@@ -24,7 +24,7 @@ description languages for detecting threats. end
-source_dl = http://www.clamav.net/downloads/production/ +source_dl = https://www.clamav.net/downloads/production/
build requires @@ -41,7 +41,7 @@ build zlib-devel end
- LDFLAGS += -Wl,--as-needed + export LD_LIBRARY_PATH = %{DIR_APP}/libclamav/.libs:%{DIR_APP}/libfreshclam/.libs
configure_options += \ --with-dbdir=%{localstatedir}/lib/clamav \ @@ -50,7 +50,7 @@ build --with-group=clamupdate \ --disable-rpath \ --disable-llvm \ - have_cv_ipv6=yes + --disable-zlib-vcheck
# User and group have to exist to compile the source code, # so we have to create them @@ -63,6 +63,10 @@ build useradd -u 496 -r -s /sbin/nologin -d / -M \ -g clamscan clamscan end + + test + make check + end end
packages diff --git a/compat-ncurses/compat-ncurses.nm b/compat-ncurses/compat-ncurses.nm index 677060fdf..6e36d848a 100644 --- a/compat-ncurses/compat-ncurses.nm +++ b/compat-ncurses/compat-ncurses.nm @@ -5,9 +5,8 @@
name = compat-ncurses version = 5.9 -revision = 20150117 -release = 12.%{revision} -thisapp = ncurses-%{version}-%{revision} +release = 13 +thisapp = ncurses-%{version}
groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -21,14 +20,16 @@ description discontinued 4.4 BSD classic curses library. end
-source_dl = ftp://invisible-island.net/ncurses/current/ -sources = %{thisapp}.tgz +source_dl = https://ftp.gnu.org/gnu/ncurses/
build requires gcc-c++ end
+ export CPPFLAGS += -P + CXXFLAGS += -std=c++98 + configure_options += \ --with-shared \ --without-debug \ @@ -100,6 +101,22 @@ packages end end
+ package compat-ncurses-devel + template DEVEL + + requires + compat-ncurses = %{thisver} + end + + provides + ncurses-devel = %{thisver} + end + + obsoletes + ncurses-devel <= %{thisver} + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch new file mode 100644 index 000000000..18ecf3051 --- /dev/null +++ b/compat-ncurses/patches/0001-Fix-errors-in-type-conversion.patch @@ -0,0 +1,153 @@ +From 6e12cb73e23e8e9488c6db1c4710bb4b3d2b48c3 Mon Sep 17 00:00:00 2001 +From: Adam Jiang jiang.adam@gmail.com +Date: Fri, 1 Aug 2014 19:58:40 +0900 +Subject: [PATCH 1/2] Fix errors in type conversion + +Basically, converting to 'void*' is not a good idea. However, if that +conversion is unavoidable, it should be done in a proper way. 'const_cast' +itself could not convert type 'T*' to 'void *', this patch adds +'reintepret_cast' to do it correctly. + +At the same time, function that returns on 'const' member like 'void*' should +not be declared as 'const'. +--- + c++/cursesf.h | 12 +++++++----- + c++/cursesm.h | 10 +++++----- + c++/cursesp.h | 9 +++++---- + 3 files changed, 17 insertions(+), 14 deletions(-) + +diff --git a/c++/cursesf.h b/c++/cursesf.h +index 70a30c3..23b3022 100644 +--- a/c++/cursesf.h ++++ b/c++/cursesf.h +@@ -673,7 +673,8 @@ protected: + const T* p_UserData = STATIC_CAST(T*)(0)) + : NCursesForm(nlines,ncols,begin_y,begin_x) { + if (form) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*> ++ (p_UserData))); + } + + public: +@@ -683,7 +684,7 @@ public: + bool autoDelete_Fields=FALSE) + : NCursesForm (Fields, with_frame, autoDelete_Fields) { + if (form) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + }; + + NCursesUserForm (NCursesFormField Fields[], +@@ -697,19 +698,20 @@ public: + : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, + with_frame, autoDelete_Fields) { + if (form) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*> ++ (p_UserData))); + }; + + virtual ~NCursesUserForm() { + }; + +- inline T* UserData (void) const { ++ inline T* UserData (void) { + return reinterpret_cast<T*>(get_user ()); + }; + + inline virtual void setUserData (const T* p_UserData) { + if (form) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + } + + }; +diff --git a/c++/cursesm.h b/c++/cursesm.h +index d9c2273..545ed49 100644 +--- a/c++/cursesm.h ++++ b/c++/cursesm.h +@@ -631,7 +631,7 @@ protected: + const T* p_UserData = STATIC_CAST(T*)(0)) + : NCursesMenu(nlines,ncols,begin_y,begin_x) { + if (menu) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + } + + public: +@@ -641,7 +641,7 @@ public: + bool autoDelete_Items=FALSE) + : NCursesMenu (Items, with_frame, autoDelete_Items) { + if (menu) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + }; + + NCursesUserMenu (NCursesMenuItem Items[], +@@ -653,19 +653,19 @@ public: + bool with_frame=FALSE) + : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { + if (menu) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + }; + + virtual ~NCursesUserMenu() { + }; + +- inline T* UserData (void) const { ++ inline T* UserData (void) { + return reinterpret_cast<T*>(get_user ()); + }; + + inline virtual void setUserData (const T* p_UserData) { + if (menu) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + } + }; + +diff --git a/c++/cursesp.h b/c++/cursesp.h +index 9b63d6d..661e4a9 100644 +--- a/c++/cursesp.h ++++ b/c++/cursesp.h +@@ -236,7 +236,8 @@ public: + : NCursesPanel (nlines, ncols, begin_y, begin_x) + { + if (p) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*> ++ (p_UserData))); + }; + // This creates an user panel of the requested size with associated + // user data pointed to by p_UserData. +@@ -244,14 +245,14 @@ public: + NCursesUserPanel(const T* p_UserData = STATIC_CAST(T*)(0)) : NCursesPanel() + { + if (p) +- set_user(const_cast<void *>(p_UserData)); ++ set_user(const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + }; + // This creates an user panel associated with the ::stdscr and user data + // pointed to by p_UserData. + + virtual ~NCursesUserPanel() {}; + +- T* UserData (void) const ++ T* UserData (void) + { + return reinterpret_cast<T*>(get_user ()); + }; +@@ -260,7 +261,7 @@ public: + virtual void setUserData (const T* p_UserData) + { + if (p) +- set_user (const_cast<void *>(p_UserData)); ++ set_user (const_cast<void *>(reinterpret_cast<const void*>(p_UserData))); + } + // Associate the user panel with the user data pointed to by p_UserData. + }; +-- +1.8.5.2 (Apple Git-48) + diff --git a/compat-openssl/compat-openssl.nm b/compat-openssl/compat-openssl.nm index 06ad66563..6f38281f1 100644 --- a/compat-openssl/compat-openssl.nm +++ b/compat-openssl/compat-openssl.nm @@ -5,7 +5,7 @@
name = compat-openssl version = 1.1.1s -release = 1 +release = 2 thisapp = openssl-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -95,11 +95,11 @@ packages end
provides - openssl = %{thisver} + openssl-libs = %{thisver} end
obsoletes - openssl <= %{thisver} + openssl-libs <= %{thisver} end end
diff --git a/filesystem/filesystem.nm b/filesystem/filesystem.nm index b7966a8c5..cb406610c 100644 --- a/filesystem/filesystem.nm +++ b/filesystem/filesystem.nm @@ -5,7 +5,7 @@
name = filesystem version = 002 -release = 2 +release = 3
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Base Build System/Base @@ -24,12 +24,6 @@ end sources =
build - # Pakfire supports python scriptlets since - # version 0.9.22. - requires - pakfire-builder >= 0.9.22 - end - DIR_APP = %{DIR_SRC}
build @@ -107,25 +101,6 @@ end packages package %{name} prerequires = setup - - # We do not know, if the filesystem package is the first - # in the transaction, so we create the symlinks prior to running - # the transaction. - script pretransin python - if not os.path.exists("/usr"): - os.makedirs("/usr") - - for dir in ("/lib", "/%{lib}", "/sbin", "/bin"): - usr_dir = "/usr%s" % dir - - if not os.path.exists(usr_dir): - os.makedirs(usr_dir) - - try: - os.lstat(dir) - except OSError: - os.symlink(usr_dir[1:], dir) - end end
# Although this package is not noarch, it does not diff --git a/grep/grep.nm b/grep/grep.nm index d20076202..757d577cf 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,11 +4,11 @@ ###############################################################################
name = grep -version = 3.3 +version = 3.8 release = 1
groups = Applications/Text -url = http://www.gnu.org/software/grep/ +url = https://www.gnu.org/software/grep/ license = GPLv3+ summary = A pattern matching utilities.
@@ -18,7 +18,7 @@ description prints the matching lines. GNU's grep utilities include grep, egrep and fgrep. end
-source_dl = ftp://ftp.gnu.org/gnu/grep/ +source_dl = https://ftp.gnu.org/gnu/grep/ sources = %{thisapp}.tar.xz
build @@ -26,7 +26,7 @@ build autoconf automake gettext-devel - pcre-devel + pcre2-devel texinfo end
@@ -48,8 +48,6 @@ end
packages package %{name} - groups += Base Build - provides /bin/grep bundled(gnulib) diff --git a/gzip/gzip.nm b/gzip/gzip.nm index a75fe4448..4d19885a8 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -4,11 +4,11 @@ ###############################################################################
name = gzip -version = 1.8 +version = 1.12 release = 1
groups = Applications/Compression -url = http://www.gzip.org/ +url = https://www.gzip.org/ license = GPLv2 summary = The GNU data compression program.
@@ -17,7 +17,7 @@ description program. Gzipped files have a .gz extension. end
-source_dl = ftp://ftp.gnu.org/gnu/%{name}/ +source_dl = https://ftp.gnu.org/gnu/%%7Bname%7D/
build requires @@ -29,9 +29,9 @@ build end
# NO_ASM is for textrels. - configure_options += \ - DEFS=NO_ASM \ - CPPFLAGS="-DHAVE_LSTAT" + ##configure_options += \ + # DEFS=NO_ASM \ + # CPPFLAGS="-DHAVE_LSTAT"
test make check @@ -40,8 +40,6 @@ end
packages package %{name} - groups += Base Build - provides /bin/gunzip /bin/gzip diff --git a/hostname/hostname.nm b/hostname/hostname.nm index c23a4d67f..faef8f96a 100644 --- a/hostname/hostname.nm +++ b/hostname/hostname.nm @@ -4,11 +4,11 @@ ###############################################################################
name = hostname -version = 3.15 +version = 3.23 release = 1
groups = System Environment/Base -url = http://packages.qa.debian.org/h/hostname.html +url = https://packages.qa.debian.org/h/hostname.html license = GPLv2+ summary = Utility to set/show the host name or domain name.
@@ -21,24 +21,20 @@ source_dl = http://ftp.de.debian.org/debian/pool/main/h/hostname/ sources = %{name}_%{version}.tar.gz
build - DIR_APP = %{DIR_SRC}/%{name} + requires + rpcsvc-proto-devel + end
- make_build_targets += \ - CFLAGS="%{CFLAGS}" + DIR_APP = %{DIR_SRC}/%{name}
make_install_targets += \ - BASEDIR=%{BUILDROOT} \ - BINDIR=%{bindir} + BASEDIR="%{BUILDROOT}" \ + BINDIR="%{bindir}" \ + MANDIR="%{mandir}" end
packages package %{name} - groups += Base - end - - conflicts - net-tools < 2.0 - end
package %{name}-debuginfo template DEBUGINFO diff --git a/iputils/iputils.nm b/iputils/iputils.nm index 402a15269..d5ea1b477 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -4,11 +4,11 @@ ###############################################################################
name = iputils -version = s20140519 +version = 20221126 release = 1
groups = Networking/Tools -url = http://www.skbuff.net/iputils +url = https://www.skbuff.net/iputils license = BSD summary = Network monitoring tools including ping.
@@ -19,58 +19,48 @@ description the target machine is alive and receiving network traffic. end
-source_dl = https://github.com/iputils/iputils/archive/%%7Bversion%7D.tar.gz#/ +source_dl = https://github.com/iputils/iputils/archive/refs/tags/%%7Bversion%7D.tar.gz#/
build requires - docbook-utils + gettext-devel + iproute2 libcap-devel - libidn-devel + libidn2-devel + libxslt + meson + ninja openssl-devel end
- # Generate manpages with docbook. - build_cmds - make -C doc man + # Generate manpages with docbook + build + %{meson} + %{meson_build} end
install - mkdir -pv %{BUILDROOT}{%{bindir},%{sbindir}} - mkdir -pv %{BUILDROOT}%{mandir}/man8 + %{meson_install}
- install -cp clockdiff %{BUILDROOT}%{sbindir} - install -cp arping %{BUILDROOT}%{sbindir} - install -cp ping %{BUILDROOT}%{bindir} - install -cp ping6 %{BUILDROOT}%{bindir} - install -cp tracepath %{BUILDROOT}%{bindir} - install -cp tracepath6 %{BUILDROOT}%{bindir} + # Create ping6 as a symlink to ping + ln -svf ping %{BUILDROOT}%{bindir}/ping6 + #ln -svf ping.8 %{BUILDROOT}%{mandir}/man/man8/ping6.8
- install -cp doc/clockdiff.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/arping.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/ping.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/rdisc.8 %{BUILDROOT}%{mandir}/man8/ - install -cp doc/tracepath.8 %{BUILDROOT}%{mandir}/man8/ + ln -svf tracepath %{BUILDROOT}%{bindir}/tracepath6 + #ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man/man8/tracepath6.8
- ln -svf ../bin/ping6 %{BUILDROOT}%{sbindir} - ln -svf ../bin/tracepath %{BUILDROOT}%{sbindir} - ln -svf ../bin/tracepath6 %{BUILDROOT}%{sbindir} - - ln -s ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8 - ln -s tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8 - - setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping - setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping6 + # This currently does not work in pakfire + #setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping + #setcap cap_net_raw=ep %{BUILDROOT}%{bindir}/arping end end
packages package %{name} - groups += Base - provides + /bin/arping /bin/ping /bin/ping6 - /sbin/arping end end
diff --git a/iputils/patches/iputils-ipfire.patch b/iputils/patches/iputils-ipfire.patch deleted file mode 100644 index 7c0b0d123..000000000 --- a/iputils/patches/iputils-ipfire.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- iputils-s20140519-dist/Makefile 2014-05-19 23:35:28.000000000 +0200 -+++ iputils-s20140519-new/Makefile 2014-05-20 10:51:07.388527442 +0200 -@@ -26,7 +26,7 @@ USE_CAP=yes - # sysfs support (with libsysfs - deprecated) [no|yes|static] - USE_SYSFS=no - # IDN support (experimental) [no|yes|static] --USE_IDN=no -+USE_IDN=yes - - # Do not use getifaddrs [no|yes|static] - WITHOUT_IFADDRS=no -@@ -34,7 +34,7 @@ WITHOUT_IFADDRS=no - ARPING_DEFAULT_DEVICE= - - # GNU TLS library for ping6 [yes|no|static] --USE_GNUTLS=yes -+USE_GNUTLS=no - # Crypto library for ping6 [shared|static|no] - USE_CRYPTO=shared - # Resolv library for ping6 [yes|static] -@@ -49,7 +49,7 @@ ENABLE_RDISC_SERVER=no - # What a pity, all new gccs are buggy and -Werror does not work. Sigh. - # CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g - CFLAGS?=-O3 -g --CFLAGS+=-fno-strict-aliasing -Wstrict-prototypes -Wall -+CFLAGS+=$(RPM_OPT_FLAGS) -fno-strict-aliasing -Wstrict-prototypes -Wall -Werror - CPPFLAGS+=-D_GNU_SOURCE - LDLIB= - -@@ -188,6 +188,7 @@ tftpd.o tftpsubs.o: tftp.h - - # ------------------------------------- - # ninfod -+ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS)) - ninfod: - @set -e; \ - if [ ! -f ninfod/Makefile ]; then \ diff --git a/iputils/patches/iputils-tracepath-doc.patch b/iputils/patches/iputils-tracepath-doc.patch deleted file mode 100644 index abfbabd39..000000000 --- a/iputils/patches/iputils-tracepath-doc.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 51aad205e5e8289b52241cd41b15e0f116c4442a -Author: Jan Synacek jsynacek@redhat.com -Date: Tue May 20 11:17:00 2014 +0200 - - tracepath,doc: fix corrupted tag - -diff --git a/doc/tracepath.sgml b/doc/tracepath.sgml -index 8048c80..756572f 100644 ---- a/doc/tracepath.sgml -+++ b/doc/tracepath.sgml -@@ -69,7 +69,7 @@ Sets the initial packet length to <replaceable/pktlen/ instead of - </varlistentry> - - <varlistentry> -- <term><option/-m</term> -+ <term><option>-m</option></term> - <listitem><para> - Set maximum hops (or maximum TTLs) to <replaceable/max_hops/ - instead of 30. diff --git a/less/less.nm b/less/less.nm index bd7272a76..2f5e6992c 100644 --- a/less/less.nm +++ b/less/less.nm @@ -4,11 +4,11 @@ ###############################################################################
name = less -version = 551 +version = 608 release = 1
groups = Applications/Text -url = http://www.greenwoodsoftware.com/less/ +url = https://www.greenwoodsoftware.com/less/ license = GPLv3+ summary = A text file browser similar to more, but better.
@@ -20,7 +20,7 @@ description example, vi). end
-source_dl = http://www.greenwoodsoftware.com/less/ +source_dl = https://www.greenwoodsoftware.com/less/
build requires @@ -29,10 +29,9 @@ build end
configure_options += \ - --sysconfdir=/etc \ --with-regex=pcre
- CFLAGS += -D_GNU_SOURCE + #CFLAGS += -D_GNU_SOURCE
install_cmds mkdir -pv %{BUILDROOT}/etc/profile.d @@ -45,8 +44,6 @@ end
packages package %{name} - groups += Base - end
package %{name}-debuginfo template DEBUGINFO diff --git a/libidn2/libidn2.nm b/libidn2/libidn2.nm new file mode 100644 index 000000000..22fab52ef --- /dev/null +++ b/libidn2/libidn2.nm @@ -0,0 +1,44 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = libidn2 +version = 2.3.4 +release = 1 + +groups = System/Libraries +url = https://www.gnu.org/software/libidn/ +license = GPLv2+ LGPLv3+ +summary = Internationalized Domain Name support library. + +description + GNU Libidn is an implementation of the Stringprep, Punycode and \ + IDNA specifications defined by the IETF Internationalized Domain \ + Names (IDN) working group, used for internationalized domain \ + names. +end + +source_dl = https://ftp.gnu.org/gnu/libidn/ + +build + configure_options += \ + --disable-csharp \ + --disable-static + + test + LD_LIBRARY_PATH="%{DIR_APP}/lib/.libs" make -C tests check + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/lzip/lzip.nm b/lzip/lzip.nm index 387e1baf2..b082972cd 100644 --- a/lzip/lzip.nm +++ b/lzip/lzip.nm @@ -4,11 +4,11 @@ ###############################################################################
name = lzip -version = 1.17 -release = 2 +version = 1.23 +release = 1
groups = Application/File -url = http://www.nongnu.org/lzip/lzip.html +url = https://www.nongnu.org/lzip/lzip.html license = GPLv3+ summary = LZMA compressor with integrity checking
@@ -19,7 +19,7 @@ description format (.lz) is not compatible with the lzma file format (.lzma). end
-source_dl = http://download.savannah.gnu.org/releases/lzip/ +source_dl = https://download.savannah.gnu.org/releases/lzip/
build configure_options += \ @@ -32,8 +32,6 @@ end
packages package %{name} - groups += Build - end
package %{name}-debuginfo template DEBUGINFO diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 4da26b72a..9dc5091ba 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -4,7 +4,7 @@ ###############################################################################
name = ncurses -version = 6.1 +version = 6.3 release = 1 thisapp = %{name}-%{version}
@@ -95,8 +95,6 @@ end
packages package %{name} - groups += Base - end
package %{name}-libs template LIBS diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 3e8ed1b1f..1f3718377 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,12 +4,12 @@ ###############################################################################
name = openssl -version = 1.1.1g +version = 3.0.7 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Libraries -url = http://www.openssl.org/ +url = https://www.openssl.org/ license = OpenSSL summary = A general purpose cryptography library with TLS implementation.
@@ -19,13 +19,14 @@ description libraries which provide various cryptographic algorithms and protocols. end
-source_dl = http://openssl.org/source/ +source_dl = https://openssl.org/source/
build requires ca-certificates coreutils perl + perl(IPC::Cmd) perl(Math::BigInt) perl(Module::Load::Conditional) perl(Test::Harness) @@ -45,23 +46,10 @@ build ssl_arch += enable-ec_nistp_64_gcc_128 end
- if "%{DISTRO_ARCH}" == "i686" - # 386 implies no-sse2 - ssl_arch = linux-elf no-asm 386 - end - if "%{DISTRO_ARCH}" == "aarch64" ssl_arch += enable-ec_nistp_64_gcc_128 end
- if "%{DISTRO_ARCH}" == "armv5tel" - ssl_arch = linux-armv4 - end - - if "%{DISTRO_ARCH}" == "armv7hl" - ssl_arch = linux-armv4 - end - build ./Configure \ --prefix=%{prefix} \ @@ -79,7 +67,6 @@ build ${CFLAGS} \ ${LDFLAGS}
- util/mkdef.pl crypto update make all
# Clean up the .pc files @@ -95,24 +82,6 @@ build install make install DESTDIR=%{BUILDROOT}
- # Rename man pages so that they don't conflict with other system man pages. - pushd %{BUILDROOT}%{mandir} - ln -svf config.5 man5/openssl.cnf.5 - for manpage in man*/*; do - if [ -L "${manpage}" ]; then - TARGET=$(ls -l "${manpage}" | awk '{ print $NF }') - ln -snf "${TARGET}ssl" "${manpage}ssl" - rm -f "${manpage}" - else - mv ${manpage} ${manpage}ssl - fi - done - for conflict in passwd rand; do - rename ${conflict} ssl${conflict} man*/${conflict}* - ln -svf ssl${conflict}.1ssl %{BUILDROOT}%{mandir}/man1/openssl-${conflict}.1ssl - done - popd - # Remove dist config rm -vf %{BUILDROOT}%{sysconfdir}/pki/tls/openssl.cnf.dist end diff --git a/patch/patch.nm b/patch/patch.nm index 11d725157..27360ed58 100644 --- a/patch/patch.nm +++ b/patch/patch.nm @@ -4,11 +4,11 @@ ###############################################################################
name = patch -version = 2.7.5 +version = 2.7.6 release = 1
groups = Development/Tools -url = http://www.gnu.org/software/patch/patch.html +url = https://www.gnu.org/software/patch/patch.html license = GPLv2+ summary = Utility for modifying/upgrading files.
@@ -20,7 +20,7 @@ description diff file to add the changes to their original file. end
-source_dl = ftp://ftp.gnu.org/gnu/patch/ +source_dl = https://ftp.gnu.org/gnu/patch/ sources = %{thisapp}.tar.xz
build @@ -30,8 +30,6 @@ build pkg-config end
- CFLAGS += -D_GNU_SOURCE - test make check end @@ -39,8 +37,6 @@ end
packages package %{name} - groups += Build - end
package %{name}-debuginfo template DEBUGINFO diff --git a/rpcsvc-proto/rpcsvc-proto.nm b/rpcsvc-proto/rpcsvc-proto.nm new file mode 100644 index 000000000..359fe546d --- /dev/null +++ b/rpcsvc-proto/rpcsvc-proto.nm @@ -0,0 +1,36 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = rpcsvc-proto +version = 1.4.3 +release = 1 + +groups = System/Libraries +url = https://github.com/thkukuk/rpcsvc-proto/ +license = BSD +summary = rpcsvc protocol definitions from glibc + +description + This package contains rpcsvc proto.x files from glibc, which are + missing in libtirpc. Additional it contains rpcgen, which is needed + to create header files and sources from protocol files. + This package is only needed, if glibc is installed without the + deprecated sunrpc functionality and libtirpc should replace it. +end + +source_dl = https://github.com/thkukuk/rpcsvc-proto/releases/download/v%%7Bversion%7D/ +sources = %{thisapp}.tar.xz + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/sed/sed.nm b/sed/sed.nm index 7e1691b27..a6ca03db1 100644 --- a/sed/sed.nm +++ b/sed/sed.nm @@ -4,13 +4,13 @@ ###############################################################################
name = sed -version = 4.7 +version = 4.9 release = 1
groups = Applications/Text -url = http://sed.sourceforge.net/ +url = https://www.gnu.org/software/sed/ license = GPLv2+ -summary = A GNU stream text editor. +summary = A GNU stream text editor
description The sed (Stream EDitor) editor is a stream or batch (non-interactive) @@ -20,7 +20,7 @@ description specified in a script file or from the command line. end
-source_dl = ftp://ftp.gnu.org/gnu/sed/ +source_dl = https://ftp.gnu.org/gnu/sed/ sources = %{thisapp}.tar.xz
build @@ -28,11 +28,9 @@ build --without-included-regex
test - # Disable broken tests. - sed \ - -e 's|testsuite/inplace-selinux.sh||g' \ - -e 's|testsuite/panic-tests.sh||g' \ - -i Makefile + # Disable broken tests + sed -i Makefile \ + -e 's|testsuite/panic-tests.sh||g'
make check end @@ -40,8 +38,6 @@ end
packages package %{name} - groups += Base Build - provides /bin/sed end diff --git a/tinc/tinc.nm b/tinc/tinc.nm deleted file mode 100644 index 111e5fad6..000000000 --- a/tinc/tinc.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = tinc -version = 1.0.28 -release = 1 - -groups = Networking/Tools -url = http://www.tinc-vpn.org/ -license = GPLv2+ -summary = A virtual private network daemon. - -description - tinc is a Virtual Private Network (VPN) daemon that uses tunnelling - and encryption to create a secure private network between hosts on - the Internet. Because the tunnel appears to the IP level network - code as a normal network device, there is no need to adapt any - existing software. This tunnelling allows VPN sites to share - information with each other over the Internet without exposing any - information to others. -end - -source_dl = http://www.tinc-vpn.org/packages/ - -build - requires - lzo-devel - openssl-devel - zlib-devel - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer