* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a13ee144617e5c672368816c58706aa36235e1f7
@ 2025-02-15 14:58 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-02-15 14:58 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 23206 bytes --]
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 a13ee144617e5c672368816c58706aa36235e1f7 (commit)
via e6c2ab3369ce87907febebbcfcd0c1c96e936f56 (commit)
via 74899bf93cb3b7bf87ca01a22bad8f9b659e07cc (commit)
via efbc10bbd9d0419a973b927b214a7154dfc3c559 (commit)
via d6777d44dd68dd7c1f544c18b029ae7087edb737 (commit)
via b8f4a23689fa0dbe1d7dc203221a72c0554e7ce5 (commit)
via 95f10dd57f782a40a17fd9576355725b1590b0cb (commit)
via df63ef67f79c23574c39662d63f9c4fc5b1b84ae (commit)
via e75b136dfa256dc889f930a0d889ca2d9601c30e (commit)
via ae3532088a7c6a6a5902936aae9283781e23f142 (commit)
via 8a360ad297eafb65728fe814e1b5a6f171a8aa06 (commit)
via afac22edd107ed3857da0601dce84d58d61472ef (commit)
via 62951771ba234adb6e453fb66ce6d1a20cafb129 (commit)
from 65647441a420c757033b0b9ce95051bd9a78d7b3 (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 a13ee144617e5c672368816c58706aa36235e1f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:57:57 2025 +0000
snort: Fix download from GitHub
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e6c2ab3369ce87907febebbcfcd0c1c96e936f56
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:54:06 2025 +0000
ncurses: Update to 6.5
This patch also drops support for the narrow character version which is
basically unused in IPFire.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 74899bf93cb3b7bf87ca01a22bad8f9b659e07cc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:52:23 2025 +0000
glibc: Update to 2.40
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit efbc10bbd9d0419a973b927b214a7154dfc3c559
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:06:16 2025 +0000
binutils: Update to 2.44
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d6777d44dd68dd7c1f544c18b029ae7087edb737
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:06:04 2025 +0000
curl: Update to 8.12.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b8f4a23689fa0dbe1d7dc203221a72c0554e7ce5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 14:05:35 2025 +0000
vala: Update to 0.56.17
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 95f10dd57f782a40a17fd9576355725b1590b0cb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 13:44:20 2025 +0000
lmdb: Update to 0.9.31 and fix GitHub URL
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit df63ef67f79c23574c39662d63f9c4fc5b1b84ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 13:39:45 2025 +0000
zlib-ng: Replace zlib with zlib-ng
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e75b136dfa256dc889f930a0d889ca2d9601c30e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 13:39:23 2025 +0000
zlib: Update to version 1.3.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ae3532088a7c6a6a5902936aae9283781e23f142
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 13:33:34 2025 +0000
squashfs-tools: Fix download from GitHub
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8a360ad297eafb65728fe814e1b5a6f171a8aa06
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 13:33:16 2025 +0000
libbpf: Update to version 1.5.0
This also fixes the GitHub URL.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit afac22edd107ed3857da0601dce84d58d61472ef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Feb 15 11:49:32 2025 +0000
tcl: Add an SONAME to libtcl
This is necessary for out dependency tracking to work.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 62951771ba234adb6e453fb66ce6d1a20cafb129
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Jan 30 23:09:38 2025 +0000
rsync: Update to 3.4.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
binutils/binutils.nm | 2 +-
curl/curl.nm | 2 +-
glibc/glibc.nm | 7 +-
libbpf/libbpf.nm | 7 +-
lmdb/lmdb.nm | 9 ++-
ncurses/ncurses.nm | 149 +++++++++-----------------------------
rsync/rsync.nm | 9 ++-
snort/snort.nm | 8 +-
squashfs-tools/squashfs-tools.nm | 5 +-
tcl/patches/tcl-8.6.15-conf.patch | 22 ++++++
tcl/tcl.nm | 5 +-
vala/vala.nm | 3 +-
zlib-ng/zlib-ng.nm | 112 ++++++++++++++++++++++++++++
zlib/zlib.nm | 50 -------------
14 files changed, 205 insertions(+), 185 deletions(-)
create mode 100644 tcl/patches/tcl-8.6.15-conf.patch
create mode 100644 zlib-ng/zlib-ng.nm
delete mode 100644 zlib/zlib.nm
Difference in files:
diff --git a/binutils/binutils.nm b/binutils/binutils.nm
index 17613454f..ea62b93cd 100644
--- a/binutils/binutils.nm
+++ b/binutils/binutils.nm
@@ -4,7 +4,7 @@
###############################################################################
name = binutils
-version = 2.43.1
+version = 2.44
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
diff --git a/curl/curl.nm b/curl/curl.nm
index 6e060d2fc..8184c5861 100644
--- a/curl/curl.nm
+++ b/curl/curl.nm
@@ -4,7 +4,7 @@
###############################################################################
name = curl
-version = 8.11.1
+version = 8.12.0
release = 1
groups = Application/Internet
diff --git a/glibc/glibc.nm b/glibc/glibc.nm
index 395735ef1..912a50f89 100644
--- a/glibc/glibc.nm
+++ b/glibc/glibc.nm
@@ -4,7 +4,7 @@
###############################################################################
name = glibc
-version = 2.38
+version = 2.40
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -101,7 +101,7 @@ build
# Locales
mkdir -pv %{BUILDROOT}/usr/lib/locale
# This would install all locales that are supported
- make localedata/install-locales install_root=%{BUILDROOT}
+ make localedata/install-locales install_root=%{BUILDROOT} %{PARALLELISMFLAGS}
# Install runtime linker configuration
install -v -m 644 %{DIR_SOURCE}/ld.so.conf %{BUILDROOT}%{sysconfdir}
@@ -120,9 +120,6 @@ build
> %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
chmod 644 %{BUILDROOT}%{libdir}/gconv/gconv-modules.cache
- # Strip any object files
- strip --strip-debug %{BUILDROOT}%{libdir}/*.o
-
# Some gconv libraries requires other libraries and contain $ORIGIN
# as RUNPATH because they are all located in the same directory.
# We do not support $ORIGIN as RUNPATH so change this to the directory
diff --git a/libbpf/libbpf.nm b/libbpf/libbpf.nm
index 321aa0cf2..744300507 100644
--- a/libbpf/libbpf.nm
+++ b/libbpf/libbpf.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libbpf
-version = 1.2.2
+version = 1.5.0
release = 1
groups = System/Libraries
@@ -16,7 +16,10 @@ description
eBPF helper library
end
-source_dl = https://github.com/libbpf/libbpf/archive/refs/tags/v%{version}.tar.gz#/
+# This project is hosted on GitHub
+github_version = v%{version}
+
+source_dl = %{github_url}
build
requires
diff --git a/lmdb/lmdb.nm b/lmdb/lmdb.nm
index cc63fab52..3d9505e0c 100644
--- a/lmdb/lmdb.nm
+++ b/lmdb/lmdb.nm
@@ -4,7 +4,7 @@
###############################################################################
name = lmdb
-version = 0.9.29
+version = 0.9.31
release = 1
thisapp = LMDB_%{version}
@@ -21,10 +21,13 @@ description
to the size of the virtual address space.
end
-source_dl = https://git.openldap.org/openldap/openldap/-/archive
+# This project is hosted on GitHub
+github_organization = LMDB
+
+source_dl = %{github_tag_url}
build
- DIR_APP = %{DIR_SRC}/openldap-LMDB_%{version}-8ad7be2510414b9506ec9f9e24f24d04d9b04a1a/libraries/liblmdb
+ DIR_APP = %{DIR_SRC}/lmdb-%{thisapp}/libraries/liblmdb
prepare_cmds
sed -i "%{DIR_SOURCE}/lmdb.pc" \
diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm
index db53476a3..691c3137c 100644
--- a/ncurses/ncurses.nm
+++ b/ncurses/ncurses.nm
@@ -4,8 +4,8 @@
###############################################################################
name = ncurses
-version = 6.4
-release = 2
+version = 6.5
+release = 1
thisapp = %{name}-%{version}
groups = System/Base
@@ -20,7 +20,7 @@ description
discontinued 4.4 BSD classic curses library.
end
-source_dl = https://github.com/mirror/%{name}/archive/v%{version}.tar.gz#/
+source_dl = https://invisible-island.net/archives/ncurses/
build
requires
@@ -31,69 +31,33 @@ build
--with-shared \
--without-debug \
--without-ada \
- --with-ospeed=unsigned \
- --with-chtype=long \
- --enable-hard-tabs \
- --enable-xmc-glitch \
- --enable-colorfgbg \
--with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \
+ --with-termlib=tinfo \
+ --with-pkg-config-libdir=%{libdir}/pkg-config \
+ --with-cxx-binding \
+ --with-cxx-shared \
--enable-overwrite \
--enable-pc-files \
- --with-termlib=tinfo \
- --disable-stripping
-
- export PKG_CONFIG_LIBDIR=%{libdir}/pkgconfig
-
- build
- mkdir -pv narrowc widec
-
- # Build narrowc version.
- cd narrowc
- ln -svf ../configure .
- ./configure %{configure_options} --with-ticlib
- make %{PARALLELISMFLAGS} libs
- make %{PARALLELISMFLAGS} -C progs
-
- # Build widec version.
- cd ../widec
- ln -svf ../configure .
- ./configure %{configure_options} --enable-widec --without-progs
- make %{PARALLELISMFLAGS} libs
- cd ..
- end
-
- install
- make -C narrowc DESTDIR=%{BUILDROOT} install.{libs,progs,data}
- rm -rvf %{BUILDROOT}%{libdir}/libtinfo.*
- make -C widec DESTDIR=%{BUILDROOT} install.{libs,includes,man}
-
- chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.*
+ --enable-hard-tabs \
+ --enable-xmc-glitch \
+ --enable-colorfgbg \
+ --disable-stripping \
+ --disable-root-access \
+ --disable-root-environ \
+ --disable-setuid-environ
+ install_cmds
mkdir -pv %{BUILDROOT}/etc/terminfo
- mkdir %{BUILDROOT}%{includedir}/ncurses{,w}
- for l in %{BUILDROOT}%{includedir}/*.h; do
- ln -s ../$(basename $l) %{BUILDROOT}%{includedir}/ncurses
- ln -s ../$(basename $l) %{BUILDROOT}%{includedir}/ncursesw
- done
+ # Some packages are looking for -lcurses instead of -lncurses
+ printf "INPUT(-lncursesw)\n" > "%{BUILDROOT}%{libdir}/libcursesw.so"
+ ln -svf "libncurses.so" "%{BUILDROOT}%{libdir}/libcurses.so"
- # don't require -ltinfo when linking with --no-add-needed
- for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do
- soname=$(basename $(readlink $l))
- rm -f $l
- echo "INPUT($soname -ltinfo)" > $l
+ # Have packages linking against libncurses use libncursesw instead
+ for lib in ncurses ncurses++ form panel menu; do
+ printf "INPUT(-l%sw)\n" "${lib}" > "%{BUILDROOT}%{libdir}/lib${lib}.so"
+ ln -svf "${lib}w.pc" "%{BULDROOT}%{libdir}/pkgconfig/${lib}.pc"
done
-
- rm -f %{BUILDROOT}%{libdir}/libcurses{,w}.so
- echo "INPUT(-lncurses)" > %{BUILDROOT}%{libdir}/libcurses.so
- echo "INPUT(-lncursesw)" > %{BUILDROOT}%{libdir}/libcursesw.so
- echo "INPUT(-ltinfo)" > %{BUILDROOT}%{libdir}/libtermcap.so
-
- rm -vf %{BUILDROOT}%{libdir}/terminfo
- rm -vf %{BUILDROOT}%{libdir}/pkgconfig/{*_g,ncurses++*}.pc
-
- # Manually remove all static libraries
- rm -vf %{BUILDROOT}%{libdir}/*.a
end
end
@@ -104,7 +68,7 @@ packages
template LIBS
requires
- %{name}-base=%{thisver}
+ %{name}-terminfo = %{thisver}
end
end
@@ -112,71 +76,28 @@ packages
template DEVEL
end
- package %{name}-term
+ package %{name}-terminfo
summary = Terminal descriptions for ncurses.
+
description
- This package contains additional terminal descriptions not found in
- the ncurses-base package.
+ This package contains terminal descriptions.
end
- provides += /usr/share/terminfo
-
- files
+ provides
/usr/share/terminfo
- end
- end
- package %{name}-base
- summary = Terminal descriptions.
- description
- This package contains descriptions of common terminals. Other terminal
- descriptions are included in the ncurses-term package.
+ # This package replaces the former ncurces-base & -term packages
+ %{name}-base = %{thisver}
+ %{name}-term = %{thisver}
end
- conflicts = ncurses<=5.9-1
+ obsoletes
+ %{name}-base < %{thisver}
+ %{name}-term < %{thisver}
+ end
files
- /usr/share/terminfo/*/Eterm*
- /usr/share/terminfo/*/ansi
- /usr/share/terminfo/*/aterm
- /usr/share/terminfo/*/bterm
- /usr/share/terminfo/*/cons25
- /usr/share/terminfo/*/cygwin
- /usr/share/terminfo/*/dumb
- /usr/share/terminfo/*/eterm*
- /usr/share/terminfo/*/gnome
- /usr/share/terminfo/*/gnome-256color
- /usr/share/terminfo/*/hurd
- /usr/share/terminfo/*/jfbterm
- /usr/share/terminfo/*/konsole
- /usr/share/terminfo/*/konsole-256color
- /usr/share/terminfo/*/linux
- /usr/share/terminfo/*/mach*
- /usr/share/terminfo/*/mlterm
- /usr/share/terminfo/*/mrxvt
- /usr/share/terminfo/*/nsterm
- /usr/share/terminfo/*/putty*
- /usr/share/terminfo/*/pcansi
- /usr/share/terminfo/*/rxvt
- /usr/share/terminfo/*/rxvt-*
- /usr/share/terminfo/*/screen
- /usr/share/terminfo/*/screen-*color
- /usr/share/terminfo/*/screen.*
- /usr/share/terminfo/*/sun
- /usr/share/terminfo/*/teraterm
- /usr/share/terminfo/*/teraterm2.3
- /usr/share/terminfo/*/vt100
- /usr/share/terminfo/*/vt100-nav
- /usr/share/terminfo/*/vt102
- /usr/share/terminfo/*/vt220
- /usr/share/terminfo/*/vt52
- /usr/share/terminfo/*/vte
- /usr/share/terminfo/*/vte-256color
- /usr/share/terminfo/*/vwmterm
- /usr/share/terminfo/*/wsvt25*
- /usr/share/terminfo/*/xfce
- /usr/share/terminfo/*/xterm
- /usr/share/terminfo/*/xterm-*
+ /usr/share/terminfo
end
end
diff --git a/rsync/rsync.nm b/rsync/rsync.nm
index 9ed5c12cd..f7198a917 100644
--- a/rsync/rsync.nm
+++ b/rsync/rsync.nm
@@ -4,7 +4,7 @@
###############################################################################
name = rsync
-version = 3.2.7
+version = 3.4.1
release = 1
groups = Applications/Internet
@@ -22,7 +22,7 @@ description
package.
end
-source_dl = https://rsync.samba.org/ftp/rsync/
+source_dl = https://download.samba.org/pub/rsync/src/
build
requires
@@ -31,6 +31,7 @@ build
lz4-devel
openssl-devel
popt-devel
+ xxhash-devel
zlib-devel
zstd-devel
@@ -43,8 +44,8 @@ build
--without-included-popt \
--without-included-zlib \
--enable-openssl \
- --enable-zstd \
- --disable-xxhash
+ --enable-xxhash \
+ --enable-zstd
test
make check || :
diff --git a/snort/snort.nm b/snort/snort.nm
index 53389edf9..c7f516b8c 100644
--- a/snort/snort.nm
+++ b/snort/snort.nm
@@ -5,7 +5,7 @@
name = snort
version = 3.1.50.0
-release = 2
+release = 2.1
thisapp = snort3-%{version}
groups = Networking/Tools
@@ -17,7 +17,11 @@ description
Snort 3 is the next generation Snort IPS (Intrusion Prevention System).
end
-source_dl = https://github.com/snort3/snort3/archive/refs/tags/%{version}.tar.gz#/
+# This project is hosted on GitHub
+github_organization = snort3
+github_project = snort3
+
+source_dl = %{github_url}
build
requires
diff --git a/squashfs-tools/squashfs-tools.nm b/squashfs-tools/squashfs-tools.nm
index c9f68b083..68b4799e8 100644
--- a/squashfs-tools/squashfs-tools.nm
+++ b/squashfs-tools/squashfs-tools.nm
@@ -18,7 +18,10 @@ description
This package contains the utilities for manipulating squashfs filesystems.
end
-source_dl = https://github.com/plougher/squashfs-tools/archive/refs/tags/%{version}.tar.gz#/
+# This project is hosted on GitHub
+github_organization = plougher
+
+source_dl = %{github_url}
build
requires
diff --git a/tcl/patches/tcl-8.6.15-conf.patch b/tcl/patches/tcl-8.6.15-conf.patch
new file mode 100644
index 000000000..5a20be7a3
--- /dev/null
+++ b/tcl/patches/tcl-8.6.15-conf.patch
@@ -0,0 +1,22 @@
+diff --git a/tcl.m4 b/tcl.m4
+index 7f5464e..c844c4d 100644
+--- a/tcl.m4
++++ b/tcl.m4
+@@ -1378,7 +1378,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ # get rid of the warnings.
+ #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+
+- SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
++ SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -Wl,-soname,${@}'
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1394,7 +1394,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+ esac
+
+ AS_IF([test $doRpath = yes], [
+- CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"'])
++ CC_SEARCH_FLAGS=''])
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ AS_IF([test $do64bit = yes], [
diff --git a/tcl/tcl.nm b/tcl/tcl.nm
index 19e5024d2..7f137f4a4 100644
--- a/tcl/tcl.nm
+++ b/tcl/tcl.nm
@@ -6,7 +6,7 @@
name = tcl
major_ver = 8.6
version = %{major_ver}.13
-release = 2
+release = 3
thisapp = tcl%{version}
groups = Development/Languages
@@ -39,6 +39,9 @@ build
prepare_cmds
# Don't build support for sqlite3.
rm -rf %{DIR_SRC}/%{thisapp}/pkgs/sqlite3*
+
+ # Apply changes
+ autoconf
end
configure_options += \
diff --git a/vala/vala.nm b/vala/vala.nm
index 31dd804a8..04207f501 100644
--- a/vala/vala.nm
+++ b/vala/vala.nm
@@ -5,7 +5,7 @@
name = vala
ver_major = 0.56
-ver_minor = 13
+ver_minor = 17
version = %{ver_major}.%{ver_minor}
release = 1
@@ -30,6 +30,7 @@ build
dbus
dbus-glib-devel
flex
+ gobject-introspection-devel
graphviz-devel
pkg-config
end
diff --git a/zlib-ng/zlib-ng.nm b/zlib-ng/zlib-ng.nm
new file mode 100644
index 000000000..c487a3c1b
--- /dev/null
+++ b/zlib-ng/zlib-ng.nm
@@ -0,0 +1,112 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = zlib-ng
+version = 2.2.4
+release = 1
+
+groups = System/Libraries
+url = https://github.com/zlib-ng/zlib-ng
+license = zlib
+summary = zlib replacement with optimizations for "next generation" systems
+
+description
+ zlib-ng is a replacement for zlib which incorporates improvements
+ from various sources.
+end
+
+source_dl = %{github_url}
+
+# This package is compatible with zlib in version 1.3.1
+zlib_version = 1.3.1
+
+build
+ requires
+ cmake
+ end
+
+ build
+ mkdir -pv build build-compat
+
+ # Build the regular version
+ pushd build
+ %{cmake} .. \
+ -DWITH_GTEST=OFF
+ %{make_build}
+ popd
+
+ # Build the drop-in replacement
+ pushd build-compat
+ %{cmake} .. \
+ -DWITH_GTEST=OFF \
+ -DZLIB_COMPAT=ON \
+ -DWITH_NEW_STRATEGIES=OFF
+ %{make_build}
+ popd
+ end
+
+ test
+ pushd build
+ make test
+ popd
+
+ pushd build-compat
+ make test
+ popd
+ end
+
+ install
+ pushd build
+ %{make_install}
+ popd
+
+ pushd build-compat
+ %{make_install}
+ popd
+ end
+end
+
+packages
+ package %{name}
+
+ package %{name}-compat
+ summary = Compatibility library of zlib-ng
+
+ provides = zlib = %{zlib_version}
+ obsoletes = zlib <= %{zlib_version}
+ conflicts = zlib
+
+ files
+ %{libdir}/libz.so.*
+ end
+ end
+
+ package %{name}-devel
+ template DEVEL
+
+ files += %{libdir}/cmake/zlib-ng
+ end
+
+ package %{name}-compat-devel
+ summary = Development headers to the legacy version of zlib
+
+ requires = %{name}-compat = %{thisver}
+ provides = zlib-devel = %{zlib_version}
+ obsoletes = zlib-devel <= %{zlib_version}
+ conflicts = zlib-devel
+
+ files
+ %{includedir}
+ !%{includedir}/*-ng*
+ %{libdir}/cmake/ZLIB
+ %{libdir}/libz.so
+ %{libdir}/pkgconfig/zlib.pc
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/zlib/zlib.nm b/zlib/zlib.nm
deleted file mode 100644
index e832c9145..000000000
--- a/zlib/zlib.nm
+++ /dev/null
@@ -1,50 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = zlib
-version = 1.3
-release = 1
-
-groups = System/Libraries
-url = https://zlib.net/
-license = zlib
-summary = The zlib compression and decompression library.
-
-description
- Zlib is a general-purpose, patent-free, lossless data compression
- library which is used by many different programs.
-end
-
-source_dl = https://zlib.net/
-
-# Enable PIC build.
-CFLAGS += -fPIC -DPIC
-
-build
- configure_options = \
- --prefix=%{prefix} \
- --libdir=%{libdir}
-
- test
- make check
- end
-
- install_cmds
- mkdir -pv %{BUILDROOT}%{includedir} %{BUILDROOT}%{libdir}
- cp -pfv zconf.h zlib.h %{BUILDROOT}%{includedir}
- end
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-02-15 14:58 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-15 14:58 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a13ee144617e5c672368816c58706aa36235e1f7 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox