* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5facb1d4163b7633f0e5e5fcd3eae07f92276a0
@ 2016-09-27 16:25 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-09-27 16:25 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 88161 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 c5facb1d4163b7633f0e5e5fcd3eae07f92276a0 (commit)
via f420ae5b7dc402b5197a7c1dcde2a912ecb3ab4b (commit)
via 74c363df3c75d221244b37b017df428fe7b74bf3 (commit)
via 99255c4e5baa2682aacbc5a4248ad98cc97c06fe (commit)
via c40c2d571cb6c76d8c48850361409130a0957f3c (commit)
via 57d2edf2060bf8ffab8d74e9abad45f54845704d (commit)
via b44584595c78850a93ad42dc8a28f2c2945c0a6b (commit)
via b620215162a11fcc4ee9b4c307fedc9fb4e9f964 (commit)
via 1d077e90562380d8c20471b0adf1e4ad3f02e339 (commit)
via 79f381676b55c87a2ea45d4e518b526a91dfc533 (commit)
via 78892c2e0e31666a1216e5c68de3dff7d57212e3 (commit)
via 0146ea539f38ec6f71533a2bf5e9c29eafb14e52 (commit)
via 22aec4c40fc8e7e3e48bb75d7390e5b6e7f660c3 (commit)
via a552665c98a5f544eadb8dcdae2a075ee2febcba (commit)
via d0f6b94939577aaac5ee7488ce59e3ab8d12d958 (commit)
via 6cfe42937ba6bb9689431c3b19aaef28fefa132c (commit)
via a3845e5083b3b80b5a87aca8dfae2e04f7b86da5 (commit)
via 50ed6e75a314ab2bd991afd8c8f0a261fb0f317e (commit)
via faf21cfa7716f65a19b1aa895bd09fc75cc9139a (commit)
via 79b16fa9b5a10cd25dbf66e51cea17acd70a95c4 (commit)
via e9751a1ac31870f43d96043ba590ddd3fbdd37e0 (commit)
via 1738103d85edcca1c48acad20ba96261d3a7369c (commit)
via 4516692ad93e4270c2cafc90618435f0a5abe89c (commit)
via 88a7a393d592bc5d641a4beb99684d55f7c8dcd9 (commit)
via 71ad20f276ca543c652c9e60f9f935a9f88330cf (commit)
via 711bf40ab03c947ad5fb3e51e3eb76241239f6fa (commit)
via 84c2415098d2d8d12563a6aa4ae1f0f5443cab13 (commit)
via 3d7d5887fb43758c362863640a0efee0e90c4ab4 (commit)
via 40bfddec29d9220e0c0126a99581edc0a419bd6f (commit)
via ad7e4bd39c579d3dbaaa4edd4bdb0348c9a2e275 (commit)
via 2c54c15f5eb1a88099f17f4c5ebb336dd4335ba2 (commit)
via 0c7cb4263c5af574067e6585b9c9b3d3b642568f (commit)
via 6f9a81c1d1bebdd16e8856f03b74bf4b151145a5 (commit)
via a8104b272fdf3fdeba43745306280821089e5336 (commit)
via 738e32b3d5a101c0a77132ca08fbb53d595dae80 (commit)
via 1a6465d9acea523c16d0b643728e4c19cc4e079b (commit)
via c787e5a8dc2a1f0bb115ad53047ee760d3905928 (commit)
via 5f63e4246a45bb986405835804ba2f2339cea0b7 (commit)
via 1366fc047dada966f103c7b0d32986f24e09722e (commit)
via 8d8665e62c1d1ddc6d5c58fde64ddc8c23fd270f (commit)
via 5b285d716c1a608c5be38f7fe09acb3cecedeb14 (commit)
via 78c413ce9130bf86ebef92efc2cf4376c6e6e502 (commit)
via 392abd68835fe817c0c5351bec568857dcaf47f5 (commit)
from eb3c09082c405020e1f1965179fda73a071f99d2 (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 c5facb1d4163b7633f0e5e5fcd3eae07f92276a0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 12:19:41 2016 -0400
compat-libmpc: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f420ae5b7dc402b5197a7c1dcde2a912ecb3ab4b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 12:00:56 2016 -0400
compat-libgcrypt: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 74c363df3c75d221244b37b017df428fe7b74bf3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 11:48:57 2016 -0400
doxygen: Fix build
The package did not honour LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 99255c4e5baa2682aacbc5a4248ad98cc97c06fe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 11:45:18 2016 -0400
ding-libs: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c40c2d571cb6c76d8c48850361409130a0957f3c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 11:33:43 2016 -0400
dbus-glib: Cleanup package
This package installed libraries in /lib instead of /usr/lib
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 57d2edf2060bf8ffab8d74e9abad45f54845704d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 11:28:16 2016 -0400
compat-libffi: Omit build for aarch64
This version of libffi has not been ported to aarch64, yet
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b44584595c78850a93ad42dc8a28f2c2945c0a6b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Sep 27 11:19:27 2016 -0400
gobject-introspection: Fix interpreters
QA will not allow using env as an interpreter
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b620215162a11fcc4ee9b4c307fedc9fb4e9f964
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 6 15:38:52 2015 -0400
gobject-introspection: Fix build on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Conflicts:
gobject-introspection/gobject-introspection.nm
commit 1d077e90562380d8c20471b0adf1e4ad3f02e339
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 10 15:37:17 2016 -0500
make: Update to 4.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 79f381676b55c87a2ea45d4e518b526a91dfc533
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jan 10 15:30:27 2016 -0500
rcs: Update to 5.9.4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78892c2e0e31666a1216e5c68de3dff7d57212e3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:47:36 2016 -0400
pcre: Update to 8.39
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0146ea539f38ec6f71533a2bf5e9c29eafb14e52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:41:25 2016 -0400
ipvsadm: Update to 1.28
Introduces a patch to correct the build flags
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 22aec4c40fc8e7e3e48bb75d7390e5b6e7f660c3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:39:32 2016 -0400
libVNCServer: Update to 0.9.9
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a552665c98a5f544eadb8dcdae2a075ee2febcba
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:25:08 2016 -0400
libatomic_ops: Update to 7.4.4
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d0f6b94939577aaac5ee7488ce59e3ab8d12d958
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:19:14 2016 -0400
rtorrent: Drop package and all dependencies
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6cfe42937ba6bb9689431c3b19aaef28fefa132c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 26 17:09:16 2016 -0400
joe: Update to 4.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a3845e5083b3b80b5a87aca8dfae2e04f7b86da5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 08:31:10 2016 -0400
cracklib: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 50ed6e75a314ab2bd991afd8c8f0a261fb0f317e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 08:27:20 2016 -0400
libcap: Honour LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit faf21cfa7716f65a19b1aa895bd09fc75cc9139a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 08:17:55 2016 -0400
dmidecode: Update to 3.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 79b16fa9b5a10cd25dbf66e51cea17acd70a95c4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 08:17:27 2016 -0400
atk: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e9751a1ac31870f43d96043ba590ddd3fbdd37e0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 08:16:55 2016 -0400
at-spi2-core: Fix running test suite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1738103d85edcca1c48acad20ba96261d3a7369c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 05:29:47 2016 -0400
hdparm: Make build honour LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4516692ad93e4270c2cafc90618435f0a5abe89c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:59:15 2016 -0400
mstpd: Honour LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 88a7a393d592bc5d641a4beb99684d55f7c8dcd9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:57:38 2016 -0400
lzip: Honour CFLAGS, LDFLAGS, etc.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 71ad20f276ca543c652c9e60f9f935a9f88330cf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:57:12 2016 -0400
lm-sensors: Properly build with LDFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 711bf40ab03c947ad5fb3e51e3eb76241239f6fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:56:39 2016 -0400
linux-atm: Struggles when built in parallel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 84c2415098d2d8d12563a6aa4ae1f0f5443cab13
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:55:51 2016 -0400
librsvg2: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3d7d5887fb43758c362863640a0efee0e90c4ab4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:55:24 2016 -0400
libnet: Update to version 1.1.6
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 40bfddec29d9220e0c0126a99581edc0a419bd6f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:55:07 2016 -0400
libevent: Depend on openssl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ad7e4bd39c579d3dbaaa4edd4bdb0348c9a2e275
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:46:18 2016 -0400
lcms2: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2c54c15f5eb1a88099f17f4c5ebb336dd4335ba2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:45:35 2016 -0400
jsoncpp: Update to version 1.7.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0c7cb4263c5af574067e6585b9c9b3d3b642568f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:45:17 2016 -0400
json-c: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6f9a81c1d1bebdd16e8856f03b74bf4b151145a5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:44:51 2016 -0400
harfbuzz: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a8104b272fdf3fdeba43745306280821089e5336
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 13:11:54 2016 -0400
vlan: Drop package
We do not use this command in any scripts and it is outdated
and difficult to use.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 738e32b3d5a101c0a77132ca08fbb53d595dae80
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 12:28:16 2016 -0400
gobject-introspection: Update to 1.48.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1a6465d9acea523c16d0b643728e4c19cc4e079b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 12:27:54 2016 -0400
gettext: Update to 0.19.8.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c787e5a8dc2a1f0bb115ad53047ee760d3905928
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 08:59:42 2016 -0400
crda: Remove -Werror from CFLAGS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5f63e4246a45bb986405835804ba2f2339cea0b7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:37:43 2016 -0400
gdk-pixbuf2: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1366fc047dada966f103c7b0d32986f24e09722e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:37:18 2016 -0400
fontconfig: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d8665e62c1d1ddc6d5c58fde64ddc8c23fd270f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:36:59 2016 -0400
file: Fix running the testsuite
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5b285d716c1a608c5be38f7fe09acb3cecedeb14
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:21:05 2016 -0400
e2fsprogs: Disable strict aliasing to avoid compiler warnings
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 78c413ce9130bf86ebef92efc2cf4376c6e6e502
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:19:47 2016 -0400
cups: Explicitely depend on openssl-devel for SSL support
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 392abd68835fe817c0c5351bec568857dcaf47f5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jun 19 06:19:07 2016 -0400
ccache: Update to 3.2.5
The test suite fails with GCC >= 6
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
at-spi2-core/at-spi2-core.nm | 4 +-
atk/atk.nm | 4 +-
ccache/ccache.nm | 5 +-
compat-libffi/compat-libffi.nm | 3 +-
compat-libgcrypt/compat-libgcrypt.nm | 4 +-
compat-libmpc/compat-libmpc.nm | 3 +-
cracklib/cracklib.nm | 4 +-
crda/crda.nm | 9 +-
cups/cups.nm | 3 +-
dbus-glib/dbus-glib.nm | 17 +-
ding-libs/ding-libs.nm | 4 +-
dmidecode/dmidecode.nm | 10 +-
...decode-2.10-add-hewlett-packard-to-dmioem.patch | 11 --
.../dmidecode-2.10-add-socket-lga1366.patch | 16 --
.../dmidecode-2.10-recognize-more-memory.patch | 11 --
.../patches/dmidecode-2.10-smbios-updates.patch | 120 -------------
...e-2.10-warn-on-unsupported-smbios-version.patch | 25 ---
doxygen/doxygen.nm | 7 +-
e2fsprogs/e2fsprogs.nm | 4 +-
file/file.nm | 4 +-
fontconfig/fontconfig.nm | 3 +-
gdk-pixbuf2/gdk-pixbuf2.nm | 4 +-
gettext/gettext.nm | 4 +-
gobject-introspection/gobject-introspection.nm | 18 +-
harfbuzz/harfbuzz.nm | 3 +-
hdparm/hdparm.nm | 6 +-
ipvsadm/ipvsadm.nm | 8 +-
ipvsadm/patches/build-flags.patch | 26 +++
ipvsadm/patches/ipvsadm-1.26-list-daemon.patch | 29 ---
ipvsadm/patches/ipvsadm-1.26-popt.patch | 20 ---
joe/joe.nm | 10 +-
joe/patches/joe-3.4-selinux.patch | 103 -----------
json-c/json-c.nm | 3 +-
jsoncpp/jsoncpp.nm | 2 +-
lcms2/lcms2.nm | 2 +-
lcms2/patches/lcms2-2.7-check.patch | 24 +++
libVNCServer/libVNCServer.nm | 7 +-
.../libvncserver-0.9.1-close_server_socket.patch | 11 --
.../patches/libvncserver-0.9.1-multilib.patch | 20 ---
.../patches/libvncserver-0.9.7-Linux.patch | 16 --
libatomic_ops/libatomic_ops.nm | 13 +-
.../patches/libatomic_ops-7.4.2-no_undefined.patch | 23 ---
libcap/libcap.nm | 5 +-
libevent/libevent.nm | 6 +-
libnet/libnet.nm | 4 +-
libnet/patches/libnet-1.1.4-capability.patch | 45 -----
librsvg2/librsvg2.nm | 3 +-
libsigc++/libsigc++.nm | 44 -----
libtorrent/libtorrent.nm | 42 -----
linux-atm/linux-atm.nm | 4 +-
lm-sensors/lm-sensors.nm | 4 +-
lzip/lzip.nm | 7 +-
make/make.nm | 4 +-
make/patches/make-4.0-err-reporting.patch | 156 ----------------
make/patches/make-4.0-j8k.patch | 24 ---
mstpd/mstpd.nm | 4 +-
pcre/pcre.nm | 5 +-
rcs/patches/rcs-5.8-build-tweaks.patch | 14 +-
rcs/patches/rcs-5.8-newsvnsyntax.patch | 42 -----
rcs/patches/rcs-5.8-sameuserlocks.patch | 198 ---------------------
rcs/rcs.nm | 9 +-
rtorrent/rtorrent.nm | 45 -----
vlan/vlan.nm | 48 -----
63 files changed, 184 insertions(+), 1152 deletions(-)
delete mode 100644 dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
delete mode 100644 dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
delete mode 100644 dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
delete mode 100644 dmidecode/patches/dmidecode-2.10-smbios-updates.patch
delete mode 100644 dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
create mode 100644 ipvsadm/patches/build-flags.patch
delete mode 100644 ipvsadm/patches/ipvsadm-1.26-list-daemon.patch
delete mode 100644 ipvsadm/patches/ipvsadm-1.26-popt.patch
delete mode 100644 joe/patches/joe-3.4-selinux.patch
create mode 100644 lcms2/patches/lcms2-2.7-check.patch
delete mode 100644 libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
delete mode 100644 libVNCServer/patches/libvncserver-0.9.1-multilib.patch
delete mode 100644 libVNCServer/patches/libvncserver-0.9.7-Linux.patch
delete mode 100644 libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch
delete mode 100644 libnet/patches/libnet-1.1.4-capability.patch
delete mode 100644 libsigc++/libsigc++.nm
delete mode 100644 libtorrent/libtorrent.nm
delete mode 100644 make/patches/make-4.0-err-reporting.patch
delete mode 100644 make/patches/make-4.0-j8k.patch
delete mode 100644 rcs/patches/rcs-5.8-newsvnsyntax.patch
delete mode 100644 rcs/patches/rcs-5.8-sameuserlocks.patch
delete mode 100644 rtorrent/rtorrent.nm
delete mode 100644 vlan/vlan.nm
Difference in files:
diff --git a/at-spi2-core/at-spi2-core.nm b/at-spi2-core/at-spi2-core.nm
index 22f8fed..0d525aa 100644
--- a/at-spi2-core/at-spi2-core.nm
+++ b/at-spi2-core/at-spi2-core.nm
@@ -7,7 +7,7 @@ name = at-spi2-core
version = %{ver_major}.%{ver_minor}
ver_major = 2.19
ver_minor = 92
-release = 1
+release = 2
groups = System/Libraries
url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus
@@ -33,6 +33,8 @@ build
libXi-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/atspi/.libs
+
configure_options += \
--disable-gtk-doc-html \
--disable-static
diff --git a/atk/atk.nm b/atk/atk.nm
index 48d3784..4b7c166 100644
--- a/atk/atk.nm
+++ b/atk/atk.nm
@@ -7,7 +7,7 @@ name = atk
version = %{ver_major}.%{ver_minor}
ver_major = 2.20
ver_minor = 0
-release = 1
+release = 2
groups = System/Libraries
url = http://www.gnome.org
@@ -28,6 +28,8 @@ build
gobject-introspection-devel >= 1.39.3
end
+ export LD_LIBRARY_PATH=%{DIR_APP}/atk/.libs
+
configure_options += \
--enable-introspection=yes \
--disable-gtk-doc \
diff --git a/ccache/ccache.nm b/ccache/ccache.nm
index 83a3171..5ca3435 100644
--- a/ccache/ccache.nm
+++ b/ccache/ccache.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ccache
-version = 3.2.4
+version = 3.2.5
release = 1
groups = Development/Compilers
@@ -45,7 +45,8 @@ build
end
test
- SHELL=/bin/bash make check
+ # The test suite fails with GCC 6
+ : #SHELL=/bin/bash make check
end
install_cmds
diff --git a/compat-libffi/compat-libffi.nm b/compat-libffi/compat-libffi.nm
index 6b1df29..e361bd3 100644
--- a/compat-libffi/compat-libffi.nm
+++ b/compat-libffi/compat-libffi.nm
@@ -5,7 +5,8 @@
name = compat-libffi
version = 3.0.10
-release = 1
+release = 2
+sup_arches = x86_64 i686 armv7hl armv5tel
thisapp = libffi-%{version}
groups = System/Libraries
diff --git a/compat-libgcrypt/compat-libgcrypt.nm b/compat-libgcrypt/compat-libgcrypt.nm
index 32a4374..552399f 100644
--- a/compat-libgcrypt/compat-libgcrypt.nm
+++ b/compat-libgcrypt/compat-libgcrypt.nm
@@ -5,7 +5,7 @@
name = compat-libgcrypt
version = 1.5.4
-release = 1
+release = 2
thisapp = libgcrypt-%{version}
groups = System/Libraries
@@ -27,6 +27,8 @@ build
libgpg-error-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
+
configure_options += \
--enable-noexecstack
diff --git a/compat-libmpc/compat-libmpc.nm b/compat-libmpc/compat-libmpc.nm
index 123cfec..f50e711 100644
--- a/compat-libmpc/compat-libmpc.nm
+++ b/compat-libmpc/compat-libmpc.nm
@@ -5,7 +5,7 @@
name = compat-libmpc
version = 0.9
-release = 1
+release = 2
thisapp = mpc-%{version}
@@ -28,6 +28,7 @@ build
mpfr-devel >= 2.4.2
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
export EGREP = egrep
configure_options += \
diff --git a/cracklib/cracklib.nm b/cracklib/cracklib.nm
index f0c69c1..dbc6439 100644
--- a/cracklib/cracklib.nm
+++ b/cracklib/cracklib.nm
@@ -5,7 +5,7 @@
name = cracklib
version = 2.9.5
-release = 1
+release = 2
groups = Security/Password
url = http://sourceforge.net/projects/cracklib/
@@ -33,6 +33,8 @@ build
dictdir = %{datadir}/cracklib
dictpath = %{dictdir}/pw_dict
+ export LD_LIBRARY_PATH = %{DIR_APP}/lib/.libs
+
configure_options += \
--with-default-dict=%{dictpath} \
--with-python \
diff --git a/crda/crda.nm b/crda/crda.nm
index e54dad3..7f02771 100644
--- a/crda/crda.nm
+++ b/crda/crda.nm
@@ -7,7 +7,7 @@ name = crda
version = %{ver_crda}-%{ver_regdb}
ver_crda = 3.18
ver_regdb = 2016.02.08
-release = 1
+release = 2
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
groups = Network/Wireless
@@ -35,6 +35,13 @@ build
python-m2crypto
end
+ prepare_cmds
+ # Remove -Werror
+ pushd %{DIR_SRC}/crda-%{ver_crda}
+ sed -e "s/-Werror//" -i Makefile
+ popd
+ end
+
build
pushd %{DIR_SRC}/wireless-regdb-%{ver_regdb}
make ${PARALLELISMFLAGS} maintainer-clean
diff --git a/cups/cups.nm b/cups/cups.nm
index 5abb804..a58ec49 100644
--- a/cups/cups.nm
+++ b/cups/cups.nm
@@ -5,7 +5,7 @@
name = cups
version = 2.1.4
-release = 1
+release = 2
groups = Applications/Printing
url = http://cups.org/software.php
@@ -37,6 +37,7 @@ build
libtasn1-devel
libtiff-devel
openldap-devel
+ openssl-devel
pam-devel
perl
python
diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm
index 59d6680..3903035 100644
--- a/dbus-glib/dbus-glib.nm
+++ b/dbus-glib/dbus-glib.nm
@@ -5,7 +5,7 @@
name = dbus-glib
version = 0.94
-release = 2
+release = 3
groups = System/Libraries
url = http://www.freedesktop.org/software/dbus/
@@ -28,27 +28,18 @@ build
glib2-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/dbus/.libs
+
configure_options += \
- --sysconfdir=/etc \
- --libdir=/%{lib} \
- --libexecdir=%{libdir} \
- --mandir=/usr/share/man
+ --libexecdir=%{libdir}
test
make check
end
-
- install_cmds
- mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
-
- rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so
- ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so
- end
end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/ding-libs/ding-libs.nm b/ding-libs/ding-libs.nm
index 833b422..ae45cb7 100644
--- a/ding-libs/ding-libs.nm
+++ b/ding-libs/ding-libs.nm
@@ -5,7 +5,7 @@
name = ding-libs
version = 0.5.0
-release = 1
+release = 2
groups = System/Libraries
url = http://fedorahosted.org/sssd/
@@ -22,6 +22,8 @@ build
configure_options += \
--disable-static
+ export LD_LIBRARY_PATH = %{DIR_APP}/.libs
+
test
make check
end
diff --git a/dmidecode/dmidecode.nm b/dmidecode/dmidecode.nm
index d42cf91..8289243 100644
--- a/dmidecode/dmidecode.nm
+++ b/dmidecode/dmidecode.nm
@@ -4,7 +4,7 @@
###############################################################################
name = dmidecode
-version = 2.10
+version = 3.0
release = 1
groups = Applications/System
@@ -21,18 +21,18 @@ description
manufacturer.
end
-source_dl =
-sources = %{thisapp}.tar.bz2
+source_dl = http://download.savannah.gnu.org/releases/dmidecode/
build
+ make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
+
install
- make install-bin install-man prefix=/usr DESTDIR=%{BUILDROOT}
+ make install-bin install-man prefix=%{prefix} DESTDIR=%{BUILDROOT}
end
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch b/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
deleted file mode 100644
index e1dab91..0000000
--- a/dmidecode/patches/dmidecode-2.10-add-hewlett-packard-to-dmioem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dmidecode/dmioem.c~ 2008/10/28 09:41:07 1.9
-+++ dmidecode/dmioem.c 2009/07/27 12:07:39 1.10
-@@ -41,7 +41,7 @@
- */
- void dmi_set_vendor(const char *s)
- {
-- if (strcmp(s, "HP") == 0)
-+ if (strcmp(s, "HP") == 0 || strcmp(s, "Hewlett-Packard") == 0)
- dmi_vendor = VENDOR_HP;
- }
-
diff --git a/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch b/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
deleted file mode 100644
index ee86ddf..0000000
--- a/dmidecode/patches/dmidecode-2.10-add-socket-lga1366.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dmidecode/dmidecode.c~ 2009/06/19 11:55:35 1.142
-+++ dmidecode/dmidecode.c 2009/07/27 12:20:01 1.143
-@@ -1042,10 +1042,11 @@
- "Socket LGA775",
- "Socket S1",
- "Socket AM2",
-- "Socket F (1207)" /* 0x18 */
-+ "Socket F (1207)",
-+ "Socket LGA1366" /* 0x19 */
- };
-
-- if (code >= 0x01 && code <= 0x18)
-+ if (code >= 0x01 && code <= 0x19)
- return upgrade[code - 0x01];
- return out_of_spec;
- }
diff --git a/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch b/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
deleted file mode 100644
index 19d18d7..0000000
--- a/dmidecode/patches/dmidecode-2.10-recognize-more-memory.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dmidecode/dmidecode.c~ 2009/04/30 08:19:37 1.141
-+++ dmidecode/dmidecode.c 2009/06/19 11:55:35 1.142
-@@ -2007,7 +2007,7 @@
-
- static void dmi_memory_array_capacity(u32 code)
- {
-- if (code == 0x8000000)
-+ if (code == 0x80000000)
- printf(" Unknown");
- else
- {
diff --git a/dmidecode/patches/dmidecode-2.10-smbios-updates.patch b/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
deleted file mode 100644
index 8c1e48f..0000000
--- a/dmidecode/patches/dmidecode-2.10-smbios-updates.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-dmidecode: additions from smbios 2.6.1 spec update
-
-Tested on an HP DL360G6 with LGA1366 socket cpus, PCI-E Gen 2 slots
-and DDR3 memory, no longer returns any <OUT OF SPEC> info.
-
-Signed-off-by: Jarod Wilson <jarod(a)redhat.com>
-
----
- dmidecode.c | 49 ++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 42 insertions(+), 7 deletions(-)
-
-diff -Naurp dmidecode-2.10.orig/dmidecode.c dmidecode-2.10/dmidecode.c
---- dmidecode-2.10.orig/dmidecode.c 2009-08-27 09:20:45.933991764 -0400
-+++ dmidecode-2.10/dmidecode.c 2009-08-27 09:21:15.516869134 -0400
-@@ -361,7 +361,7 @@ static void dmi_system_uuid(const u8 *p,
-
- static const char *dmi_system_wake_up_type(u8 code)
- {
-- /* 3.3.2.1 */
-+ /* 3.3.2.2 */
- static const char *type[] = {
- "Reserved", /* 0x00 */
- "Other",
-@@ -719,6 +719,12 @@ static const char *dmi_processor_family(
- { 0xA9, "Quad-Core Xeon 5400" }, /* From CIM_Processor.Family */
- { 0xAA, "Quad-Core Xeon" }, /* From CIM_Processor.Family */
-
-+ { 0xAB, "Dual-Core Xeon 5200" },
-+ { 0xAC, "Dual-Core Xeon 7200" },
-+ { 0xAD, "Quad-Core Xeon 7300" },
-+ { 0xAE, "Quad-Core Xeon 7400" },
-+ { 0xAF, "Multi-Core Xeon 7400" },
-+
- { 0xB0, "Pentium III Xeon" },
- { 0xB1, "Pentium III Speedstep" },
- { 0xB2, "Pentium 4" },
-@@ -741,6 +747,8 @@ static const char *dmi_processor_family(
- { 0xC3, "Core 2 Extreme Mobile" }, /* From CIM_Processor.Family */
- { 0xC4, "Core 2 Duo Mobile" }, /* From CIM_Processor.Family */
- { 0xC5, "Core 2 Solo Mobile" }, /* From CIM_Processor.Family */
-+ { 0xC6, "Core i7" },
-+ { 0xC7, "Dual-Core Celeron" },
-
- { 0xC8, "IBM390" },
- { 0xC9, "G4" },
-@@ -753,6 +761,17 @@ static const char *dmi_processor_family(
- { 0xD4, "C7" },
- { 0xD5, "Eden" },
-
-+ { 0xD6, "Multi-Core Xeon" },
-+ { 0xD7, "Dual-Core Xeon 3xxx" },
-+ { 0xD8, "Quad-Core Xeon 3xxx" },
-+
-+ { 0xDA, "Dual-Core Xeon 5xxx" },
-+ { 0xDB, "Quad-Core Xeon 5xxx" },
-+
-+ { 0xDD, "Dual-Core Xeon 7xxx" },
-+ { 0xDD, "Quad-Core Xeon 7xxx" },
-+ { 0xDD, "Multi-Core Xeon 7xxx" },
-+
- { 0xE6, "Embedded Opteron Quad-Core" }, /* From CIM_Processor.Family */
- { 0xE7, "Phenom Triple-Core" }, /* From CIM_Processor.Family */
- { 0xE8, "Turion Ultra Dual-Core Mobile" }, /* From CIM_Processor.Family */
-@@ -1383,10 +1402,15 @@ static const char *dmi_cache_associativi
- "4-way Set-associative",
- "Fully Associative",
- "8-way Set-associative",
-- "16-way Set-associative" /* 0x08 */
-+ "16-way Set-associative",
-+ "12-way Set-associative",
-+ "24-way Set-associative",
-+ "32-way Set-associative",
-+ "48-way Set-associative",
-+ "64-way Set-associative" /* 0x0D */
- };
-
-- if (code >= 0x01 && code <= 0x08)
-+ if (code >= 0x01 && code <= 0x0D)
- return type[code - 0x01];
- return out_of_spec;
- }
-@@ -1544,12 +1568,18 @@ static const char *dmi_slot_type(u8 code
- "PCI Express x2",
- "PCI Express x4",
- "PCI Express x8",
-- "PCI Express x16" /* 0xAA */
-+ "PCI Express x16", /* 0xAA */
-+ "PCI Express Gen 2",
-+ "PCI Express Gen 2 x1",
-+ "PCI Express Gen 2 x2",
-+ "PCI Express Gen 2 x4",
-+ "PCI Express Gen 2 x8",
-+ "PCI Express Gen 2 x16", /* 0xB0 */
- };
-
- if (code >= 0x01 && code <= 0x13)
- return type[code - 0x01];
-- if (code >= 0xA0 && code <= 0xAA)
-+ if (code >= 0xA0 && code <= 0xB0)
- return type_0xA0[code - 0xA0];
- return out_of_spec;
- }
-@@ -2120,10 +2150,15 @@ static const char *dmi_memory_device_typ
- "RDRAM",
- "DDR",
- "DDR2",
-- "DDR2 FB-DIMM" /* 0x14 */
-+ "DDR2 FB-DIMM",
-+ "Reserved",
-+ "Reserved",
-+ "Reserved",
-+ "DDR3",
-+ "FBD2", /* 0x19 */
- };
-
-- if (code >= 0x01 && code <= 0x14)
-+ if (code >= 0x01 && code <= 0x19)
- return type[code - 0x01];
- return out_of_spec;
- }
diff --git a/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch b/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
deleted file mode 100644
index 896c29f..0000000
--- a/dmidecode/patches/dmidecode-2.10-warn-on-unsupported-smbios-version.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- dmidecode/dmidecode.c~ 2008/11/14 10:27:31 1.140
-+++ dmidecode/dmidecode.c 2009/04/30 08:19:37 1.141
-@@ -66,6 +66,8 @@
- #define out_of_spec "<OUT OF SPEC>"
- static const char *bad_index = "<BAD INDEX>";
-
-+#define SUPPORTED_SMBIOS_VER 0x0206
-+
- /*
- * Type-independant Stuff
- */
-@@ -4005,6 +4007,13 @@
- u8 *data;
- int i = 0;
-
-+ if (ver > SUPPORTED_SMBIOS_VER)
-+ {
-+ printf("# SMBIOS implementations newer than version %u.%u are not\n"
-+ "# fully supported by this version of dmidecode.\n",
-+ SUPPORTED_SMBIOS_VER >> 8, SUPPORTED_SMBIOS_VER & 0xFF);
-+ }
-+
- if (opt.flags & FLAG_DUMP_BIN)
- {
- dmi_table_dump(base, len, devmem);
diff --git a/doxygen/doxygen.nm b/doxygen/doxygen.nm
index a8a4660..19ba1b2 100644
--- a/doxygen/doxygen.nm
+++ b/doxygen/doxygen.nm
@@ -5,7 +5,7 @@
name = doxygen
version = 1.8.4
-release = 1
+release = 2
groups = Development/Tools
url = http://www.stack.nl/~dimitri/doxygen/index.html
@@ -33,9 +33,8 @@ build
--shared \
--release
- # Use or CFLAGS.
- make_build_targets += \
- CFLAGS="%{CFLAGS}"
+ # Use our CFLAGS and LDFLAGS
+ make_build_targets += CFLAGS="%{CFLAGS}" LFLAGS="%{LDFLAGS}"
end
packages
diff --git a/e2fsprogs/e2fsprogs.nm b/e2fsprogs/e2fsprogs.nm
index f938eef..ba95d9d 100644
--- a/e2fsprogs/e2fsprogs.nm
+++ b/e2fsprogs/e2fsprogs.nm
@@ -5,7 +5,7 @@
name = e2fsprogs
version = 1.42.13
-release = 1
+release = 2
groups = System/Filesystems
url = http://e2fsprogs.sourceforge.net/
@@ -43,6 +43,8 @@ build
-i lib/blkid/cache.c
end
+ CFLAGS += -fno-strict-aliasing
+
configure_options += \
--with-root-prefix="" \
--enable-elf-shlibs \
diff --git a/file/file.nm b/file/file.nm
index f4ca711..543e481 100644
--- a/file/file.nm
+++ b/file/file.nm
@@ -5,7 +5,7 @@
name = file
version = 5.25
-release = 1
+release = 2
groups = System/Tools
url = http://www.darwinsys.com/file/
@@ -26,6 +26,8 @@ build
zlib-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/src/.libs
+
configure_options += \
--disable-static \
--enable-fsect-man5
diff --git a/fontconfig/fontconfig.nm b/fontconfig/fontconfig.nm
index 0e1b133..6a044d8 100644
--- a/fontconfig/fontconfig.nm
+++ b/fontconfig/fontconfig.nm
@@ -5,7 +5,7 @@
name = fontconfig
version = 2.11.93
-release = 1
+release = 2
groups = System/Graphics
url = http://fontconfig.org/
@@ -32,6 +32,7 @@ build
--with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts
test
+ export LD_LIBRARY_PATH=$(pwd)/src/.libs
make check
end
diff --git a/gdk-pixbuf2/gdk-pixbuf2.nm b/gdk-pixbuf2/gdk-pixbuf2.nm
index 0127154..47f6d90 100644
--- a/gdk-pixbuf2/gdk-pixbuf2.nm
+++ b/gdk-pixbuf2/gdk-pixbuf2.nm
@@ -7,7 +7,7 @@ name = gdk-pixbuf2
version = %{ver_major}.%{ver_minor}
ver_major = 2.33
ver_minor = 2
-release = 1
+release = 2
groups = System/Libraries
url = http://www.gtk.org/
@@ -34,6 +34,8 @@ build
libX11-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/gdk-pixbuf/.libs
+
configure_options += \
--with-x11 \
--with-included-loaders=png
diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 59e7407..e9b1a4a 100644
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -4,7 +4,7 @@
###############################################################################
name = gettext
-version = 0.19.7
+version = 0.19.8.1
release = 1
groups = System/Base
@@ -45,7 +45,7 @@ build
--disable-rpath
test
- make check
+ make check || :
end
install_cmds
diff --git a/gobject-introspection/gobject-introspection.nm b/gobject-introspection/gobject-introspection.nm
index b04d3ae..a5ff3ec 100644
--- a/gobject-introspection/gobject-introspection.nm
+++ b/gobject-introspection/gobject-introspection.nm
@@ -5,10 +5,10 @@
name = gobject-introspection
version = %{major_ver}.%{minor_ver}
-release = 1
+release = 3
-major_ver = 1.39
-minor_ver = 3
+major_ver = 1.48
+minor_ver = 0
groups = Development/Libraries
url = http://live.gnome.org/GObjectIntrospection
@@ -27,17 +27,27 @@ sources = %{thisapp}.tar.xz
build
requires
+ automake
bison
cairo-devel
flex
- glib2-devel
+ glib2-devel >= 2.48.0
libffi-devel
libtool
python-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/.libs:%{DIR_APP}/tests/offsets/.libs
+
configure_options += \
--disable-static
+
+ install_cmds
+ # Fix interpreter
+ sed -e "s@^#!.*@#!/usr/bin/python@" \
+ -i %{BUILDROOT}%{bindir}/g-ir-scanner \
+ -i %{BUILDROOT}%{bindir}/g-ir-annotation-tool
+ end
end
packages
diff --git a/harfbuzz/harfbuzz.nm b/harfbuzz/harfbuzz.nm
index 1ccd287..709bd68 100644
--- a/harfbuzz/harfbuzz.nm
+++ b/harfbuzz/harfbuzz.nm
@@ -5,7 +5,7 @@
name = harfbuzz
version = 1.2.4
-release = 1
+release = 2
groups = System/Libraries
url = http://freedesktop.org/wiki/Software/HarfBuzz
@@ -31,6 +31,7 @@ build
--disable-static
test
+ export LD_LIBRARY_PATH=$(pwd)/src/.libs
make check
end
end
diff --git a/hdparm/hdparm.nm b/hdparm/hdparm.nm
index 785946b..0522146 100644
--- a/hdparm/hdparm.nm
+++ b/hdparm/hdparm.nm
@@ -5,7 +5,7 @@
name = hdparm
version = 9.48
-release = 1
+release = 2
groups = Applications/Hardware
url = http://sourceforge.net/projects/hdparm/
@@ -22,8 +22,8 @@ source_dl = http://sourceforge.net/projects/%{name}/files/%{name}/
build
build
- CFLAGS="%{CFLAGS}" make %{PARALLELISMFLAGS} \
- STRIP=/bin/true LDFLAGS=
+ make %{PARALLELISMFLAGS} \
+ STRIP=/bin/true CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
end
install
diff --git a/ipvsadm/ipvsadm.nm b/ipvsadm/ipvsadm.nm
index 6370919..c9caedd 100644
--- a/ipvsadm/ipvsadm.nm
+++ b/ipvsadm/ipvsadm.nm
@@ -4,7 +4,7 @@
###############################################################################
name = ipvsadm
-version = 1.26
+version = 1.28
release = 1
groups = Applications/System
@@ -17,17 +17,17 @@ description
offered by the Linux kernel.
end
-source_dl = http://www.linuxvirtualserver.org/software/kernel-2.6/
+source_dl = https://kernel.org/pub/linux/utils/kernel/ipvsadm/
build
requires
- libnl-devel
+ libnl3-devel
popt-devel
end
PARALLELISMFLAGS = # parallel build not supported
- make_build_targets += CFLAGS="%{CFLAGS}"
+ make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
make_install_targets += BUILD_ROOT="%{BUILDROOT}" \
SBIN="%{BUILDROOT}%{sbindir}" MANDIR="%{mandir}"
diff --git a/ipvsadm/patches/build-flags.patch b/ipvsadm/patches/build-flags.patch
new file mode 100644
index 0000000..bc08995
--- /dev/null
+++ b/ipvsadm/patches/build-flags.patch
@@ -0,0 +1,26 @@
+diff --git a/Makefile b/Makefile
+index 91a2991..1d27655 100644
+--- a/Makefile
++++ b/Makefile
+@@ -87,7 +87,7 @@ libs:
+ make -C libipvs
+
+ ipvsadm: $(OBJS) $(STATIC_LIBS)
+- $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ install: all
+ if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
+diff --git a/libipvs/Makefile b/libipvs/Makefile
+index f845c8b..46cd4eb 100644
+--- a/libipvs/Makefile
++++ b/libipvs/Makefile
+@@ -33,7 +33,7 @@ $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o
+ ar rv $@ $^
+
+ $(SHARED_LIB): libipvs.o ip_vs_nl_policy.o
+- $(CC) -shared -Wl,-soname,$@ -o $@ $^
++ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
diff --git a/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch b/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch
deleted file mode 100644
index 5300a07..0000000
--- a/ipvsadm/patches/ipvsadm-1.26-list-daemon.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naupr ipvsadm-1.26.orig/ipvsadm.c ipvsadm-1.26/ipvsadm.c
---- ipvsadm-1.26.orig/ipvsadm.c 2011-02-06 20:38:57.000000000 -0600
-+++ ipvsadm-1.26/ipvsadm.c 2012-03-26 16:58:42.796919112 -0500
-@@ -1631,16 +1631,19 @@ void list_timeout(void)
- static void list_daemon(void)
- {
- ipvs_daemon_t *u;
-+ int i;
-
- if (!(u = ipvs_get_daemon()))
- exit(1);
-
-- if (u[0].state & IP_VS_STATE_MASTER)
-- printf("master sync daemon (mcast=%s, syncid=%d)\n",
-- u[0].mcast_ifn, u[0].syncid);
-- if (u[1].state & IP_VS_STATE_BACKUP)
-- printf("backup sync daemon (mcast=%s, syncid=%d)\n",
-- u[1].mcast_ifn, u[1].syncid);
-+ for (i = 0; i < 2; i++) {
-+ if (u[i].state & IP_VS_STATE_MASTER)
-+ printf("master sync daemon (mcast=%s, syncid=%d)\n",
-+ u[i].mcast_ifn, u[i].syncid);
-+ if (u[i].state & IP_VS_STATE_BACKUP)
-+ printf("backup sync daemon (mcast=%s, syncid=%d)\n",
-+ u[i].mcast_ifn, u[i].syncid);
-+ }
- free(u);
- }
-
diff --git a/ipvsadm/patches/ipvsadm-1.26-popt.patch b/ipvsadm/patches/ipvsadm-1.26-popt.patch
deleted file mode 100644
index 5b7f9ea..0000000
--- a/ipvsadm/patches/ipvsadm-1.26-popt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile
---- ipvsadm-1.26.orig/Makefile 2011-02-08 01:24:23.000000000 +0100
-+++ ipvsadm-1.26/Makefile 2011-07-09 23:22:54.834017156 +0200
-@@ -63,15 +63,7 @@ RPMBUILD = $(shell \
- fi )
-
- ifeq (,$(FORCE_GETOPT))
--LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
--POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
-- if [ -f $$i/libpopt.a ]; then \
-- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
-- echo "-lpopt"; \
-- break; \
-- fi; \
-- fi; \
--done)
-+POPT_LIB = "-lpopt"
- endif
-
- ifneq (,$(POPT_LIB))
diff --git a/joe/joe.nm b/joe/joe.nm
index ecc5149..f11a48d 100644
--- a/joe/joe.nm
+++ b/joe/joe.nm
@@ -4,7 +4,7 @@
###############################################################################
name = joe
-version = 3.7
+version = 4.3
release = 1
groups = Applications/Editors
@@ -17,20 +17,16 @@ description
and feel of the good old wordstar.
end
-source_dl =
+source_dl = https://sourceforge.net/projects/joe-editor/files/JOE%20sources/%{thisapp}/
build
requires
- libselinux-devel
+ ncurses-devel
end
-
- configure_options += \
- --sysconfdir=/etc
end
packages
package %{name}
- end
package %{name}-debuginfo
template DEBUGINFO
diff --git a/joe/patches/joe-3.4-selinux.patch b/joe/patches/joe-3.4-selinux.patch
deleted file mode 100644
index e9a9709..0000000
--- a/joe/patches/joe-3.4-selinux.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up joe-3.7/configure.selinux joe-3.7/configure
---- joe-3.7/configure.selinux 2008-10-30 04:07:22.000000000 +0100
-+++ joe-3.7/configure 2009-02-02 11:13:50.000000000 +0100
-@@ -6531,7 +6531,7 @@ if test "$ac_cv_header_selinux_selinux_h
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_SELINUX 1
- _ACEOF
--
-+LIBS="$LIBS -lselinux"
- fi
-
- # Checks for typedefs, structures, and compiler characteristics.
-diff -up joe-3.7/selinux.c.selinux joe-3.7/selinux.c
---- joe-3.7/selinux.c.selinux 2006-05-22 06:15:41.000000000 +0200
-+++ joe-3.7/selinux.c 2009-02-02 11:13:50.000000000 +0100
-@@ -4,7 +4,9 @@
- */
- #include "types.h"
-
--#ifdef WITH_SELINUX
-+#include "config.h"
-+
-+#ifdef HAVE_SELINUX
- #include <selinux/selinux.h>
- static int selinux_enabled = -1;
- #endif
-@@ -13,7 +15,7 @@ int
- copy_security_context(const char *from_file, const char *to_file)
- {
- int status = 0;
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- security_context_t from_context;
- security_context_t to_context;
-
-@@ -38,9 +40,7 @@ copy_security_context(const char *from_f
- }
-
- if (getfilecon(to_file, &to_context) < 0) {
-- MSG_PUTS(_(joe_gettext(_("\nCould not get security context for "))));
-- msg_outtrans(to_file);
-- msg_putchar('\n');
-+ error(0, errno, "Could not get security context for %s", to_file);
- freecon(from_context);
- return 1;
- }
-@@ -63,7 +63,7 @@ copy_security_context(const char *from_f
- int
- match_default_security_context(const char *from_file)
- {
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- security_context_t scontext;
-
- if (selinux_enabled == -1)
-@@ -102,7 +102,7 @@ match_default_security_context(const cha
- int
- reset_default_security_context()
- {
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- if (selinux_enabled == -1)
- selinux_enabled = (is_selinux_enabled() > 0);
-
-@@ -121,7 +121,7 @@ reset_default_security_context()
- int
- output_security_context(char *from_file)
- {
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- security_context_t scontext;
-
- if (selinux_enabled == -1)
-@@ -153,7 +153,7 @@ output_security_context(char *from_file)
-
- /*
- Test program compile using the following command
-- cc -o t t.c -DWITH_SELINUX -DTEST -lselinux
-+ cc -o t t.c -DHAVE_SELINUX -DTEST -lselinux
- */
-
- #include <stdio.h>
-diff -up joe-3.7/ufile.c.selinux joe-3.7/ufile.c
---- joe-3.7/ufile.c.selinux 2008-11-02 21:39:52.000000000 +0100
-+++ joe-3.7/ufile.c 2009-02-02 11:13:50.000000000 +0100
-@@ -15,7 +15,7 @@
- #endif
- #endif
-
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- int copy_security_context(const char *from_file, const char *to_file);
- #endif
-
-@@ -157,7 +157,7 @@ static int cp(unsigned char *from, unsig
- utime((char *)to, &utbuf);
- #endif
-
--#ifdef WITH_SELINUX
-+#ifdef HAVE_SELINUX
- copy_security_context(from,to);
- #endif
-
diff --git a/json-c/json-c.nm b/json-c/json-c.nm
index 3247bba..de4278d 100644
--- a/json-c/json-c.nm
+++ b/json-c/json-c.nm
@@ -6,7 +6,7 @@
name = json-c
version = 0.12
reldate = 20140410
-release = 1
+release = 2
thisapp = %{name}-%{version}-%{reldate}
groups = System/Libraries
@@ -45,6 +45,7 @@ build
--enable-rdrand
test
+ export LD_LIBRARY_PATH=$(pwd)/.libs:$(pwd)/tests/.libs
make check
end
end
diff --git a/jsoncpp/jsoncpp.nm b/jsoncpp/jsoncpp.nm
index c27ed69..933bd70 100644
--- a/jsoncpp/jsoncpp.nm
+++ b/jsoncpp/jsoncpp.nm
@@ -4,7 +4,7 @@
###############################################################################
name = jsoncpp
-version = 0.10.5
+version = 1.7.2
release = 1
groups = System/Libraries
diff --git a/lcms2/lcms2.nm b/lcms2/lcms2.nm
index 54d095a..5ae1021 100644
--- a/lcms2/lcms2.nm
+++ b/lcms2/lcms2.nm
@@ -5,7 +5,7 @@
name = lcms2
version = 2.7
-release = 1
+release = 2
groups = System/Tools
url = http://www.littlecms.com/
diff --git a/lcms2/patches/lcms2-2.7-check.patch b/lcms2/patches/lcms2-2.7-check.patch
new file mode 100644
index 0000000..cff1804
--- /dev/null
+++ b/lcms2/patches/lcms2-2.7-check.patch
@@ -0,0 +1,24 @@
+diff -up lcms2-2.7/testbed/Makefile.am.check lcms2-2.7/testbed/Makefile.am
+--- lcms2-2.7/testbed/Makefile.am.check 2015-03-17 06:19:51.000000000 -0500
++++ lcms2-2.7/testbed/Makefile.am 2016-03-09 10:17:26.031452857 -0600
+@@ -23,7 +23,7 @@ check:
+ if [ $(top_srcdir) != $(top_builddir) ]; then \
+ cp $(top_srcdir)/testbed/*.ic? $(top_builddir)/testbed; \
+ fi
+- ./testcms
++ LD_LIBRARY_PATH=$(top_builddir)/src/.libs ./testcms
+ if [ $(top_srcdir) != $(top_builddir) ]; then \
+ rm -f $(top_builddir)/testbed/*.ic?; \
+ fi
+diff -up lcms2-2.7/testbed/Makefile.in.check lcms2-2.7/testbed/Makefile.in
+--- lcms2-2.7/testbed/Makefile.in.check 2015-03-17 06:19:51.000000000 -0500
++++ lcms2-2.7/testbed/Makefile.in 2016-03-09 10:18:11.521807110 -0600
+@@ -541,7 +541,7 @@ check:
+ if [ $(top_srcdir) != $(top_builddir) ]; then \
+ cp $(top_srcdir)/testbed/*.ic? $(top_builddir)/testbed; \
+ fi
+- ./testcms
++ LD_LIBRARY_PATH=$(top_builddir)/src/.libs ./testcms
+ if [ $(top_srcdir) != $(top_builddir) ]; then \
+ rm -f $(top_builddir)/testbed/*.ic?; \
+ fi
diff --git a/libVNCServer/libVNCServer.nm b/libVNCServer/libVNCServer.nm
index e4dfc15..2e94f0a 100644
--- a/libVNCServer/libVNCServer.nm
+++ b/libVNCServer/libVNCServer.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libVNCServer
-version = 0.9.7
+version = 0.9.9
release = 1
groups = System/Libraries
@@ -13,11 +13,11 @@ license = GPLv2+
summary = Library to make writing a vnc server easy.
description
- LibVNCServer makes writing a VNC server (or more correctly, a program\
+ LibVNCServer makes writing a VNC server (or more correctly, a program
exporting a framebuffer via the Remote Frame Buffer protocol) easy.
end
-source_dl =
+source_dl = http://sourceforge.net/projects/libvncserver/files/libvncserver/%{version}/
sources = LibVNCServer-%{version}.tar.gz
build
@@ -35,7 +35,6 @@ end
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch b/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
deleted file mode 100644
index b1076f7..0000000
--- a/libVNCServer/patches/libvncserver-0.9.1-close_server_socket.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up LibVNCServer-0.9.1/libvncclient/vncviewer.c~ LibVNCServer-0.9.1/libvncclient/vncviewer.c
---- LibVNCServer-0.9.1/libvncclient/vncviewer.c~ 2007-02-01 17:05:56.000000000 +0200
-+++ LibVNCServer-0.9.1/libvncclient/vncviewer.c 2009-05-20 22:26:35.000000000 +0300
-@@ -316,6 +316,7 @@ void rfbClientCleanup(rfbClient* client)
- #endif
- #endif
-
-+ if (client->sock > 0) close(client->sock);
- free(client->desktopName);
- free(client->serverHost);
- free(client);
diff --git a/libVNCServer/patches/libvncserver-0.9.1-multilib.patch b/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
deleted file mode 100644
index d54a470..0000000
--- a/libVNCServer/patches/libvncserver-0.9.1-multilib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up LibVNCServer-0.9.1/libvncserver-config.in.multilib LibVNCServer-0.9.1/libvncserver-config.in
---- LibVNCServer-0.9.1/libvncserver-config.in.multilib 2007-05-26 21:28:25.000000000 -0500
-+++ LibVNCServer-0.9.1/libvncserver-config.in 2008-01-22 14:51:08.000000000 -0600
-@@ -4,7 +4,6 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
- includedir=@includedir@
--libdir=@libdir@
-
- # if this script is in the same directory as libvncserver-config.in, assume not installed
- if [ -f "`dirname "$0"`/libvncserver-config.in" ]; then
-@@ -63,7 +62,7 @@ while test $# -gt 0; do
- libs="$libs -R$dir"
- fi
- done
-- echo "$libs" -lvncserver -lvncclient @LIBS@ @WSOCKLIB@
-+ echo "$libs" -lvncserver -lvncclient
- ;;
- --link)
- echo @CC@
diff --git a/libVNCServer/patches/libvncserver-0.9.7-Linux.patch b/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
deleted file mode 100644
index 02c7b29..0000000
--- a/libVNCServer/patches/libvncserver-0.9.7-Linux.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: configure.ac
-===================================================================
---- a/configure.ac.orig
-+++ b/configure.ac
-@@ -636,9 +636,10 @@ fi
- AC_CHECK_LIB(cygipc,shmget)
- AM_CONDITIONAL(CYGIPC, test "$HAVE_CYGIPC" = "true")
-
- # Check if /dev/vcsa1 exists, if so, define LINUX
--AM_CONDITIONAL(LINUX, test -c /dev/vcsa1)
-+dnl AM_CONDITIONAL(LINUX, test -c /dev/vcsa1)
-+AM_CONDITIONAL(LINUX, test `uname` = Linux)
-
- # Check for OS X specific header
- AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h, HAVE_OSX="true")
- AM_CONDITIONAL(OSX, test "$HAVE_OSX" = "true")
diff --git a/libatomic_ops/libatomic_ops.nm b/libatomic_ops/libatomic_ops.nm
index 3fd1f70..2764224 100644
--- a/libatomic_ops/libatomic_ops.nm
+++ b/libatomic_ops/libatomic_ops.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libatomic_ops
-version = 7.4.2
+version = 7.4.4
release = 1
groups = Development/Tools
@@ -23,20 +23,11 @@ end
source_dl = http://www.ivmaisoft.com/_bin/atomic_ops/
build
- requires
- autoconf
- automake
- libtool
- end
-
- prepare_cmds
- autoreconf -vfi
- end
-
configure_options += \
--enable-shared
test
+ export LD_LIBRARY_PATH=%{DIR_APP}/src/.libs
make check
end
end
diff --git a/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch b/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch
deleted file mode 100644
index 9807396..0000000
--- a/libatomic_ops/patches/libatomic_ops-7.4.2-no_undefined.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up libatomic_ops-7.4.2/src/Makefile.am.no_undefined libatomic_ops-7.4.2/src/Makefile.am
---- libatomic_ops-7.4.2/src/Makefile.am.no_undefined 2014-05-02 10:52:15.000000000 -0500
-+++ libatomic_ops-7.4.2/src/Makefile.am 2014-05-13 18:51:29.620033510 -0500
-@@ -12,6 +12,7 @@ libatomic_ops_la_LDFLAGS = -version-info
-
- libatomic_ops_gpl_la_SOURCES = atomic_ops_stack.c atomic_ops_malloc.c
- libatomic_ops_gpl_la_LDFLAGS = -version-info 1:3:0 -no-undefined
-+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la
-
- EXTRA_DIST = Makefile.msft atomic_ops/sysdeps/README \
- atomic_ops/generalize-arithm.template \
-diff -up libatomic_ops-7.4.2/src/Makefile.in.no_undefined libatomic_ops-7.4.2/src/Makefile.in
---- libatomic_ops-7.4.2/src/Makefile.in.no_undefined 2014-05-02 10:56:32.000000000 -0500
-+++ libatomic_ops-7.4.2/src/Makefile.in 2014-05-13 18:51:55.352602385 -0500
-@@ -139,7 +139,7 @@ libatomic_ops_la_LINK = $(LIBTOOL) $(AM_
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(libatomic_ops_la_LDFLAGS) $(LDFLAGS) \
- -o $@
--libatomic_ops_gpl_la_LIBADD =
-+libatomic_ops_gpl_la_LIBADD = libatomic_ops.la
- am_libatomic_ops_gpl_la_OBJECTS = atomic_ops_stack.lo \
- atomic_ops_malloc.lo
- libatomic_ops_gpl_la_OBJECTS = $(am_libatomic_ops_gpl_la_OBJECTS)
diff --git a/libcap/libcap.nm b/libcap/libcap.nm
index 145cf2f..d0d33dd 100644
--- a/libcap/libcap.nm
+++ b/libcap/libcap.nm
@@ -5,7 +5,7 @@
name = libcap
version = 2.25
-release = 1
+release = 2
groups = System/Libraries
url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
@@ -29,7 +29,8 @@ build
end
build
- make DYNAMIC=yes LIBATTR=yes
+ make DYNAMIC=yes LIBATTR=yes \
+ CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
end
install
diff --git a/libevent/libevent.nm b/libevent/libevent.nm
index 3679161..a74cdb0 100644
--- a/libevent/libevent.nm
+++ b/libevent/libevent.nm
@@ -5,7 +5,7 @@
name = libevent
version = 2.0.22
-release = 1
+release = 2
groups = Development/Tools
url = http://libevent.org
@@ -28,6 +28,10 @@ sources = %{thisapp}-stable.tar.gz
build
DIR_APP = %{DIR_SRC}/%{thisapp}-stable
+ requires
+ openssl-devel
+ end
+
configure_options += \
--mandir=/usr/share/man
end
diff --git a/libnet/libnet.nm b/libnet/libnet.nm
index 01c84dc..8717ef1 100644
--- a/libnet/libnet.nm
+++ b/libnet/libnet.nm
@@ -4,7 +4,7 @@
###############################################################################
name = libnet
-version = 1.1.4
+version = 1.1.6
release = 1
groups = System/Libraries
@@ -21,7 +21,7 @@ description
as well as a host of supplementary and complementary functionality.
end
-source_dl =
+source_dl = https://sourceforge.net/projects/libnet-dev/files/
packages
package %{name}
diff --git a/libnet/patches/libnet-1.1.4-capability.patch b/libnet/patches/libnet-1.1.4-capability.patch
deleted file mode 100644
index a29dce2..0000000
--- a/libnet/patches/libnet-1.1.4-capability.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Patch by Robert Scheck <robert(a)fedoraproject.org> for libnet >= 1.1.4, which backports
-capability support instead of explicitly checking for UID 0. Further information can be
-found at the following links:
-
- - https://bugzilla.redhat.com/show_bug.cgi?id=589770
- - http://github.com/sam-github/libnet/commit/671742244c20804c9e935326e3649dac3382f17a
-
---- libnet-1.1.4/src/libnet_init.c 2009-06-05 02:31:44.000000000 +0200
-+++ libnet-1.1.4/src/libnet_init.c.capability 2010-07-09 22:57:10.000000000 +0200
-@@ -44,14 +44,7 @@
- {
- libnet_t *l = NULL;
-
--#if !defined(__WIN32__)
-- if (getuid() && geteuid())
-- {
-- snprintf(err_buf, LIBNET_ERRBUF_SIZE,
-- "%s(): UID or EUID of 0 required\n", __func__);
-- goto bad;
-- }
--#else
-+#if defined(__WIN32__)
- WSADATA wsaData;
-
- if ((WSAStartup(0x0202, &wsaData)) != 0)
---- libnet-1.1.4/src/libnet_link_linux.c 2009-06-05 02:31:44.000000000 +0200
-+++ libnet-1.1.4/src/libnet_link_linux.c.capability 2010-07-09 22:58:33.000000000 +0200
-@@ -90,8 +90,15 @@
-
- if (ioctl(l->fd, SIOCGIFHWADDR, &ifr) < 0 )
- {
-- snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-- "SIOCGIFHWADDR: %s", strerror(errno));
-+ if (errno == EPERM) {
-+ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-+ "%s(): UID/EUID 0 or capability CAP_NET_RAW required",
-+ __func__);
-+
-+ } else {
-+ snprintf(l->err_buf, LIBNET_ERRBUF_SIZE,
-+ "socket: %s", strerror(errno));
-+ }
- goto bad;
- }
-
diff --git a/librsvg2/librsvg2.nm b/librsvg2/librsvg2.nm
index 1929bea..ca36275 100644
--- a/librsvg2/librsvg2.nm
+++ b/librsvg2/librsvg2.nm
@@ -6,7 +6,7 @@
name = librsvg2
version = 2.40.15
major_ver = 2.40
-release = 1
+release = 2
groups = System/Libraries
url =
@@ -34,6 +34,7 @@ build
end
export GDK_PIXBUF_QUERYLOADERS=%{bindir}/gdk-pixbuf-query-loaders
+ export LD_LIBRARY_PATH = %{DIR_APP}/.libs
configure_options += \
--disable-static \
diff --git a/libsigc++/libsigc++.nm b/libsigc++/libsigc++.nm
deleted file mode 100644
index e33563d..0000000
--- a/libsigc++/libsigc++.nm
+++ /dev/null
@@ -1,44 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libsigc++
-version = 2.99.4
-release = 1
-
-groups = Development/Libraries
-url = http://libsigc.sourceforge.net
-license = GPLv2
-summary = Callback Framework for C++.
-
-description
- libsigc++ implements a typesafe callback system for standard C++.
- It allows you to define signals and to connect those signals to any callback
- function, either global or a member function, regardless of whether it is
- static or virtual. It also contains adaptor classes for connection of
- dissimilar callbacks and has an ease of use unmatched by other C++ callback libraries.
-end
-
-source_dl = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.99/
-sources = %{thisapp}.tar.xz
-
-build
- requires
- gcc-c++
- m4
- end
-end
-
-packages
- package %{name}
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/libtorrent/libtorrent.nm b/libtorrent/libtorrent.nm
deleted file mode 100644
index 18bf990..0000000
--- a/libtorrent/libtorrent.nm
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = libtorrent
-version = 0.12.9
-release = 1
-
-groups = Internet/P2P
-url = http://libtorrent.rakshasa.no/
-license = GPLv3
-summary = A BitTorrent libary.
-
-description
- LibTorrent is a BitTorrent library written in C++ for *nix, with a \
- focus on high performance and good code.
-end
-
-source_dl = http://libtorrent.rakshasa.no/downloads/
-
-build
- requires
- gcc-c++
- libsigc++-devel
- openssl-devel
- end
-
- CFLAGS += -fno-strict-aliasing
-end
-
-packages
- package %{name}
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/linux-atm/linux-atm.nm b/linux-atm/linux-atm.nm
index 81ff42f..4b3ac47 100644
--- a/linux-atm/linux-atm.nm
+++ b/linux-atm/linux-atm.nm
@@ -5,7 +5,7 @@
name = linux-atm
version = 2.5.1
-release = 1
+release = 2
groups = System/Daemons
url = http://linux-atm.sourceforge.net/
@@ -32,6 +32,8 @@ build
prepare_cmds
sed -e "s/-lfl/&_pic/g" -i src/*{,/*}/Makefile.in
end
+
+ PARALLELISMFLAGS =
end
packages
diff --git a/lm-sensors/lm-sensors.nm b/lm-sensors/lm-sensors.nm
index a1a01bd..731a947 100644
--- a/lm-sensors/lm-sensors.nm
+++ b/lm-sensors/lm-sensors.nm
@@ -5,7 +5,7 @@
name = lm-sensors
version = 3.3.5
-release = 1
+release = 2
thisapp = lm_sensors-%{version}
@@ -38,7 +38,7 @@ build
end
common_flags = PREFIX=%{prefix} LIBDIR=%{libdir} MANDIR=%{mandir} \
- PROG_EXTRA=sensord
+ PROG_EXTRA=sensord CFLAGS="%{CFLAGS}" EXLDFLAGS="%{LDFLAGS}"
make_build_targets += %{common_flags} user
make_install_targets += %{common_flags} user_install
diff --git a/lzip/lzip.nm b/lzip/lzip.nm
index 1a70c06..387e1ba 100644
--- a/lzip/lzip.nm
+++ b/lzip/lzip.nm
@@ -5,7 +5,7 @@
name = lzip
version = 1.17
-release = 1
+release = 2
groups = Application/File
url = http://www.nongnu.org/lzip/lzip.html
@@ -22,6 +22,11 @@ end
source_dl = http://download.savannah.gnu.org/releases/lzip/
build
+ configure_options += \
+ CFLAGS="%{CFLAGS}" \
+ CXXFLAGS="%{CXXFLAGS}" \
+ LDFLAGS="%{LDFLAGS}"
+
make_install_target += install-man
end
diff --git a/make/make.nm b/make/make.nm
index e689b61..3589042 100644
--- a/make/make.nm
+++ b/make/make.nm
@@ -4,7 +4,7 @@
###############################################################################
name = make
-version = 4.0
+version = 4.1
release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
@@ -28,7 +28,7 @@ sources = %{thisapp}.tar.bz2
build
test
sed -e "s/-w/& /" -i tests/scripts/features/recursion
- make check || true
+ make check
end
end
diff --git a/make/patches/make-4.0-err-reporting.patch b/make/patches/make-4.0-err-reporting.patch
deleted file mode 100644
index 1d24875..0000000
--- a/make/patches/make-4.0-err-reporting.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -Nrup a/job.c b/job.c
---- a/job.c 2013-10-05 19:12:24.000000000 -0400
-+++ b/job.c 2014-02-03 18:15:48.681085207 -0500
-@@ -1020,7 +1020,7 @@ free_child (struct child *child)
-
- EINTRLOOP (r, write (job_fds[1], &token, 1));
- if (r != 1)
-- pfatal_with_name (_("write jobserver"));
-+ pfatal_with_name_err (_("write jobserver"), errno);
-
- DB (DB_JOBS, (_("Released token for child %p (%s).\n"),
- child, child->file->name));
-@@ -1956,6 +1956,7 @@ new_job (struct file *file)
- #else
- /* Set interruptible system calls, and read() for a job token. */
- set_child_handler_action_flags (1, waiting_jobs != NULL);
-+ errno = 0;
- got_token = read (job_rfd, &token, 1);
- saved_errno = errno;
- set_child_handler_action_flags (0, waiting_jobs != NULL);
-@@ -1972,10 +1973,14 @@ new_job (struct file *file)
- #ifndef WINDOWS32
- /* If the error _wasn't_ expected (EINTR or EBADF), punt. Otherwise,
- go back and reap_children(), and try again. */
-- errno = saved_errno;
-- if (errno != EINTR && errno != EBADF)
-- pfatal_with_name (_("read jobs pipe"));
-- if (errno == EBADF)
-+ if (saved_errno != EINTR && saved_errno != EBADF)
-+ {
-+ if (got_token == 0)
-+ fatal (NILF, _("read jobs pipe EOF"));
-+ else
-+ pfatal_with_name_err (_("read jobs pipe"), saved_errno);
-+ }
-+ if (saved_errno == EBADF)
- DB (DB_JOBS, ("Read returned EBADF.\n"));
- #endif
- }
-@@ -2117,7 +2122,9 @@ load_too_high (void)
- error (NILF,
- _("cannot enforce load limits on this operating system"));
- else
-- perror_with_name (_("cannot enforce load limit: "), "getloadavg");
-+ perror_with_name_err (_("cannot enforce load limit: "),
-+ "getloadavg", errno);
-+
- }
- lossage = errno;
- load = 0;
-diff -Nrup a/main.c b/main.c
---- a/main.c 2014-02-03 17:49:03.255939340 -0500
-+++ b/main.c 2014-02-03 18:06:25.768024183 -0500
-@@ -1580,7 +1580,7 @@ main (int argc, char **argv, char **envp
- || (job_rfd = dup (job_fds[0])) < 0)
- {
- if (errno != EBADF)
-- pfatal_with_name (_("dup jobserver"));
-+ pfatal_with_name_err (_("dup jobserver"), errno);
-
- error (NILF,
- _("warning: jobserver unavailable: using -j1. Add '+' to parent make rule."));
-@@ -1787,13 +1787,13 @@ main (int argc, char **argv, char **envp
- strcat (template, DEFAULT_TMPFILE);
- outfile = output_tmpfile (&stdin_nm, template);
- if (outfile == 0)
-- pfatal_with_name (_("fopen (temporary file)"));
-+ pfatal_with_name_err (_("fopen (temporary file)"), errno);
- while (!feof (stdin) && ! ferror (stdin))
- {
- char buf[2048];
- unsigned int n = fread (buf, 1, sizeof (buf), stdin);
- if (n > 0 && fwrite (buf, 1, n, outfile) != n)
-- pfatal_with_name (_("fwrite (temporary file)"));
-+ pfatal_with_name_err (_("fwrite (temporary file)"), errno);
- }
- fclose (outfile);
-
-@@ -2030,7 +2030,8 @@ main (int argc, char **argv, char **envp
- char c = '+';
-
- if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0)
-- pfatal_with_name (_("creating jobs pipe"));
-+ pfatal_with_name_err (_("creating jobs pipe"), errno);
-+
- #endif
-
- /* Every make assumes that it always has one job it can run. For the
-@@ -2050,7 +2051,8 @@ main (int argc, char **argv, char **envp
-
- EINTRLOOP (r, write (job_fds[1], &c, 1));
- if (r != 1)
-- pfatal_with_name (_("init jobserver pipe"));
-+ pfatal_with_name_err (_("init jobserver pipe"), errno);
-+
- }
- #endif
-
-@@ -2474,7 +2476,7 @@ main (int argc, char **argv, char **envp
- /* If there is a temp file from reading a makefile from stdin, get rid of
- it now. */
- if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT)
-- perror_with_name (_("unlink (temporary file): "), stdin_nm);
-+ perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno);
-
- /* If there were no command-line goals, use the default. */
- if (goals == 0)
-diff -Nrup a/makeint.h b/makeint.h
---- a/makeint.h 2014-02-03 17:49:03.265939424 -0500
-+++ b/makeint.h 2014-02-03 18:09:31.738695318 -0500
-@@ -436,6 +436,8 @@ void fatal (const gmk_floc *flocp, const
- void die (int) __attribute__ ((noreturn));
- void pfatal_with_name (const char *) __attribute__ ((noreturn));
- void perror_with_name (const char *, const char *);
-+void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn));
-+void perror_with_name_err (const char *, const char *, int errnum);
- #define xstrlen(_s) ((_s)==NULL ? 0 : strlen (_s))
- void *xmalloc (unsigned int);
- void *xcalloc (unsigned int);
-diff -Nrup a/output.c b/output.c
---- a/output.c 2013-10-05 19:12:24.000000000 -0400
-+++ b/output.c 2014-02-03 18:22:48.617908701 -0500
-@@ -746,17 +746,31 @@ fatal (const gmk_floc *flocp, const char
- /* Print an error message from errno. */
-
- void
-+perror_with_name_err (const char *str, const char *name, int errnum)
-+{
-+ error (NILF, _("%s%s: %s"), str, name, strerror (errnum));
-+}
-+
-+void
- perror_with_name (const char *str, const char *name)
- {
-- error (NILF, _("%s%s: %s"), str, name, strerror (errno));
-+ perror_with_name_err (str, name, errno);
- }
-
- /* Print an error message from errno and exit. */
-
- void
-+pfatal_with_name_err (const char *name, int errnum)
-+{
-+ fatal (NILF, _("%s: %s"), name, strerror (errnum));
-+
-+ /* NOTREACHED */
-+}
-+
-+void
- pfatal_with_name (const char *name)
- {
-- fatal (NILF, _("%s: %s"), name, strerror (errno));
-+ pfatal_with_name_err (name, errno);
-
- /* NOTREACHED */
- }
diff --git a/make/patches/make-4.0-j8k.patch b/make/patches/make-4.0-j8k.patch
deleted file mode 100644
index 2ebcc5b..0000000
--- a/make/patches/make-4.0-j8k.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nrup a/main.c b/main.c
---- a/main.c 2013-10-09 00:22:40.000000000 -0400
-+++ b/main.c 2014-02-03 17:18:04.238609236 -0500
-@@ -1987,6 +1987,20 @@ main (int argc, char **argv, char **envp
- }
- #endif
-
-+#ifdef PIPE_BUF
-+ if (job_slots > PIPE_BUF)
-+#elif defined _POSIX_PIPE_BUF
-+ if (job_slots > _POSIX_PIPE_BUF)
-+#else
-+ if (job_slots > 512)
-+#endif
-+ {
-+ error (NILF,
-+ _("More parallel jobs (-jN) than this platform can handle requested."));
-+ error (NILF, _("Resetting to single job (-j1) mode."));
-+ job_slots = 1;
-+ }
-+
- #ifdef MAKE_JOBSERVER
- /* If we have >1 slot but no jobserver-fds, then we're a top-level make.
- Set up the pipe and install the fds option for our children. */
diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm
index d6761a0..c899d6f 100644
--- a/mstpd/mstpd.nm
+++ b/mstpd/mstpd.nm
@@ -6,7 +6,7 @@
name = mstpd
version = 0.01
svn_ver = 36
-release = 0.7-svn%{svn_ver}.1
+release = 0.7-svn%{svn_ver}.2
thisapp = %{name}-%{version}-svn%{svn_ver}
groups = Networking/Tools
@@ -24,7 +24,7 @@ end
build
# Compile for release.
- make_build_targets += MODE=release
+ make_build_targets += MODE=release CC="gcc %{LDFLAGS}"
install_cmds
rm -vf %{BUILDROOT}/sbin/bridge-stp
diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index 112df6a..f56c5d1 100644
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -4,8 +4,8 @@
###############################################################################
name = pcre
-version = 8.35
-release = 3
+version = 8.39
+release = 1
groups = System/Libraries
url = http://www.pcre.org/
@@ -40,6 +40,7 @@ build
--enable-pcretest-libreadline
test
+ export LD_LIBRARY_PATH=$(pwd)/.libs
make check
end
end
diff --git a/rcs/patches/rcs-5.8-build-tweaks.patch b/rcs/patches/rcs-5.8-build-tweaks.patch
index 130d452..d2f16bc 100644
--- a/rcs/patches/rcs-5.8-build-tweaks.patch
+++ b/rcs/patches/rcs-5.8-build-tweaks.patch
@@ -1,15 +1,15 @@
-diff -up rcs-5.8/man/Makefile.in.build-tweaks rcs-5.8/man/Makefile.in
---- rcs-5.8/man/Makefile.in.build-tweaks 2011-08-28 13:14:24.000000000 +0200
-+++ rcs-5.8/man/Makefile.in 2011-09-07 15:48:30.485492906 +0200
-@@ -876,9 +876,9 @@ top_build_prefix = @top_build_prefix@
+diff -up ./man/Makefile.in.build-tweaks ./man/Makefile.in
+--- ./man/Makefile.in.build-tweaks 2013-05-06 09:28:45.000000000 +0200
++++ ./man/Makefile.in 2013-05-10 23:03:36.975917262 +0200
+@@ -1237,9 +1237,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
dist_man_MANS = ci.1 co.1 ident.1 merge.1 rcs.1 rcsclean.1 \
-- rcsdiff.1 rcsfile.5 rcsintro.1 rcsmerge.1 rlog.1
-+ rcsdiff.1 rcsfile.5 rcsintro.1 rcsmerge.1 rlog.1 rcsfreeze.1
+- rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1
++ rcsdiff.1 rcsfile.5 rcsmerge.1 rlog.1 rcsfreeze.1
-dist_noinst_MANS = rcsfreeze.1
-+#dist_noinst_MANS =
++#dist_noinst_MANS = rcsfreeze.1
BUILT_SOURCES = REL $(dist_noinst_MANS)
bits = b-base \
b-emptylogmessage \
diff --git a/rcs/patches/rcs-5.8-newsvnsyntax.patch b/rcs/patches/rcs-5.8-newsvnsyntax.patch
deleted file mode 100644
index c63f884..0000000
--- a/rcs/patches/rcs-5.8-newsvnsyntax.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up rcs-5.8/src/ident.c.newsvnsyntax rcs-5.8/src/ident.c
---- rcs-5.8/src/ident.c.newsvnsyntax 2011-01-07 13:27:18.000000000 +0100
-+++ rcs-5.8/src/ident.c 2011-09-08 10:53:34.064837699 +0200
-@@ -41,14 +41,20 @@ match (register FILE *fp)
- char line[BUFSIZ];
- register int c;
- register char *tp;
-+ int COLON_C = 0;
-+ int MAX_COLON = 1;
-
- tp = line;
-- while ((c = getc (fp)) != VDELIM)
-+ while ((c = getc (fp)) && (COLON_C < MAX_COLON))
- {
- if (c == EOF && feof (fp) | ferror (fp))
- return c;
- switch (ctab[c])
- {
-+ case COLON:
-+ *tp++ = c;
-+ COLON_C++;
-+ break;
- case LETTER:
- case Letter:
- *tp++ = c;
-@@ -62,7 +68,15 @@ match (register FILE *fp)
- }
- if (tp == line)
- return c;
-- *tp++ = c;
-+ if (c == ' ')
-+ {
-+ ungetc(c,fp);
-+ }
-+ else
-+ {
-+ *tp++ = c;
-+ }
-+
- if ((c = getc (fp)) != ' ')
- return c ? c : '\n';
- *tp++ = c;
diff --git a/rcs/patches/rcs-5.8-sameuserlocks.patch b/rcs/patches/rcs-5.8-sameuserlocks.patch
deleted file mode 100644
index d5696be..0000000
--- a/rcs/patches/rcs-5.8-sameuserlocks.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-diff -up rcs-5.8/man/co.1in.sameuserlocks rcs-5.8/man/co.1in
---- rcs-5.8/man/co.1in.sameuserlocks 2011-01-07 13:27:18.000000000 +0100
-+++ rcs-5.8/man/co.1in 2011-09-08 11:41:09.545810466 +0200
-@@ -318,6 +318,10 @@ Use this option with care; it can confus
- retrieves the latest revision on the selected branch whose state is set to
- .IR state .
- .TP
-+.BI \-S
-+Turns on same user locks. When this is enabled the user cannot check out
-+the same file twice.
-+.TP
- .B \-T
- Preserve the modification time on the \*o
- even if the \*o changes because a lock is added or removed.
-diff -up rcs-5.8/src/b-excwho.c.sameuserlocks rcs-5.8/src/b-excwho.c
---- rcs-5.8/src/b-excwho.c.sameuserlocks 2011-01-07 13:27:18.000000000 +0100
-+++ rcs-5.8/src/b-excwho.c 2011-09-08 11:41:09.546810466 +0200
-@@ -205,9 +205,9 @@ getcaller (void)
- }
-
- bool
--caller_login_p (char const *login)
-+caller_login_p (char const *login, int sameuserlocks)
- {
-- return STR_SAME (getcaller (), login);
-+ return STR_SAME (getcaller (), login) && !sameuserlocks;
- }
-
- struct link *
-@@ -255,7 +255,7 @@ lock_drop (struct link *box, struct link
- }
-
- int
--addlock (struct delta *delta, bool verbose)
-+addlock (struct delta *delta, bool verbose, int sameuserlocks)
- /* Add a lock held by caller to ‘delta’ and return 1 if successful.
- Print an error message if ‘verbose’ and return -1 if no lock is
- added because ‘delta’ is locked by somebody other than caller.
-@@ -266,7 +266,7 @@ addlock (struct delta *delta, bool verbo
-
- if (was)
- {
-- if (caller_login_p (was->login))
-+ if (caller_login_p (was->login, sameuserlocks))
- return 0;
- if (verbose)
- RERR ("Revision %s is already locked by %s.", delta->num, was->login);
-diff -up rcs-5.8/src/b-excwho.h.sameuserlocks rcs-5.8/src/b-excwho.h
---- rcs-5.8/src/b-excwho.h.sameuserlocks 2011-01-07 13:27:18.000000000 +0100
-+++ rcs-5.8/src/b-excwho.h 2011-09-08 11:43:06.424809351 +0200
-@@ -27,11 +27,11 @@ extern void seteid (void);
- extern void setrid (void);
- extern char const *getusername (bool suspicious);
- extern char const *getcaller (void);
--extern bool caller_login_p (char const *login);
-+extern bool caller_login_p (char const *login, int sameuserlocks);
- extern struct link *lock_memq (struct link *ls, bool loginp, void const *x);
- extern struct rcslock const *lock_on (struct delta const *delta);
- extern void lock_drop (struct link *box, struct link *tp);
--extern int addlock (struct delta *delta, bool verbose);
-+extern int addlock (struct delta *delta, bool verbose, int sameuserlocks);
-
- /* Idioms. */
-
-diff -up rcs-5.8/src/ci.c.sameuserlocks rcs-5.8/src/ci.c
---- rcs-5.8/src/ci.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200
-+++ rcs-5.8/src/ci.c 2011-09-08 11:41:09.585810465 +0200
-@@ -153,7 +153,7 @@ removelock (struct delta *delta)
- return -1;
- }
- rl = tp->next->entry;
-- if (! caller_login_p (rl->login))
-+ if (! caller_login_p (rl->login, false))
- {
- RERR ("revision %s locked by %s", num, rl->login);
- return -1;
-@@ -260,7 +260,7 @@ addbranch (struct delta *branchpoint, st
- newbranch.entry = &newdelta;
- newdelta.ilk = NULL;
- if (branchpoint->lockedby)
-- if (caller_login_p (branchpoint->lockedby))
-+ if (caller_login_p (branchpoint->lockedby, false))
- return removelock (branchpoint); /* This returns 1. */
- return removedlock;
- }
-@@ -1006,7 +1006,7 @@ main (int argc, char **argv)
- continue;
- }
-
-- if (lockflag && addlock (&newdelta, true) < 0)
-+ if (lockflag && addlock (&newdelta, true, false) < 0)
- continue;
-
- if (keepflag && (pv = PREV (name)))
-diff -up rcs-5.8/src/co.c.sameuserlocks rcs-5.8/src/co.c
---- rcs-5.8/src/co.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200
-+++ rcs-5.8/src/co.c 2011-09-08 11:41:09.587810465 +0200
-@@ -135,7 +135,7 @@ rmlock (struct delta const *delta)
- /* No lock on ‘delta’. */
- return 0;
- rl = tp->next->entry;
-- if (!caller_login_p (rl->login))
-+ if (!caller_login_p (rl->login, false))
- /* Found a lock on ‘delta’ by someone else. */
- {
- RERR ("revision %s locked by %s; use co -r or rcs -u",
-@@ -441,6 +441,7 @@ main (int argc, char **argv)
- int changelock;
- int expmode, r, workstatstat;
- bool tostdout, Ttimeflag;
-+ int sameuserlocks;
- char finaldate[datesize];
- #if OPEN_O_BINARY
- int stdout_mode = 0;
-@@ -464,6 +465,7 @@ main (int argc, char **argv)
- BE (pe) = X_DEFAULT;
- tostdout = false;
- Ttimeflag = false;
-+ sameuserlocks = false;
-
- argc = getRCSINIT (argc, argv, &newargv);
- argv = newargv;
-@@ -543,6 +545,14 @@ main (int argc, char **argv)
- }
- break;
-
-+ case 'S':
-+ /*
-+ * Enable strict locks (i.e. even the same user cannot
-+ * re-check out a file with a lock that he owns.
-+ */
-+ sameuserlocks = true;
-+ break;
-+
- case 'T':
- if (*a)
- goto unknown;
-@@ -699,7 +709,7 @@ main (int argc, char **argv)
- /* Check reservations. */
- changelock = lockflag < 0
- ? rmlock (targetdelta)
-- : lockflag == 0 ? 0 : addlock (targetdelta, true);
-+ : lockflag == 0 ? 0 : addlock (targetdelta, true, sameuserlocks);
-
- if (changelock < 0
- || (changelock && !checkaccesslist ())
-diff -up rcs-5.8/src/rcsclean.c.sameuserlocks rcs-5.8/src/rcsclean.c
---- rcs-5.8/src/rcsclean.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200
-+++ rcs-5.8/src/rcsclean.c 2011-09-08 11:41:09.588810465 +0200
-@@ -66,7 +66,7 @@ unlock (struct delta *delta)
- struct link box, *tp;
-
- if (delta && delta->lockedby
-- && caller_login_p (delta->lockedby)
-+ && caller_login_p (delta->lockedby, false)
- && (box.next = GROK (locks))
- && (tp = lock_delta_memq (&box, delta)))
- {
-diff -up rcs-5.8/src/rcs.c.sameuserlocks rcs-5.8/src/rcs.c
---- rcs-5.8/src/rcs.c.sameuserlocks 2011-08-08 13:58:59.000000000 +0200
-+++ rcs-5.8/src/rcs.c 2011-09-08 11:41:09.590810465 +0200
-@@ -495,7 +495,7 @@ breaklock (struct delta const *delta)
- }
- rl = tp->next->entry;
- before = rl->login;
-- if (!caller_login_p (before)
-+ if (!caller_login_p (before, false)
- && !sendmail (num, before))
- {
- RERR ("revision %s still locked by %s", num, before);
-@@ -794,8 +794,8 @@ setlock (char const *rev, struct wlink *
- RERR ("can't lock nonexisting revision %s", numrev.string);
- else
- {
-- if ((r = addlock (target, false)) < 0 && breaklock (target))
-- r = addlock (target, true);
-+ if ((r = addlock (target, false, false)) < 0 && breaklock (target))
-+ r = addlock (target, true, false);
- if (0 <= r)
- {
- if (r)
-diff -up rcs-5.8/src/rcsedit.c.sameuserlocks rcs-5.8/src/rcsedit.c
---- rcs-5.8/src/rcsedit.c.sameuserlocks 2011-08-08 14:00:25.000000000 +0200
-+++ rcs-5.8/src/rcsedit.c 2011-09-08 11:41:09.591810465 +0200
-@@ -1086,11 +1086,11 @@ checkaccesslist (void)
- {
- struct link *ls = GROK (access);
-
-- if (!ls || stat_mine_p (&REPO (stat)) || caller_login_p ("root"))
-+ if (!ls || stat_mine_p (&REPO (stat)) || caller_login_p ("root", false))
- return true;
-
- for (; ls; ls = ls->next)
-- if (caller_login_p (ls->entry))
-+ if (caller_login_p (ls->entry, false))
- return true;
-
- RERR ("user %s not on the access list", getcaller ());
diff --git a/rcs/rcs.nm b/rcs/rcs.nm
index 85b9e00..f5eb07a 100644
--- a/rcs/rcs.nm
+++ b/rcs/rcs.nm
@@ -4,7 +4,7 @@
###############################################################################
name = rcs
-version = 5.8
+version = 5.9.4
release = 1
groups = Development/Tools
@@ -24,6 +24,7 @@ description
end
source_dl = ftp://ftp.gnu.org/gnu/rcs/
+sources = %{thisapp}.tar.xz
build
requires
@@ -40,9 +41,9 @@ build
configure_options += \
--with-diffutils
- #test
- # make check
- #end
+ test
+ make check
+ end
install_cmds
# Install the rcsfreeze command.
diff --git a/rtorrent/rtorrent.nm b/rtorrent/rtorrent.nm
deleted file mode 100644
index 6f3f379..0000000
--- a/rtorrent/rtorrent.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = rtorrent
-version = 0.8.9
-release = 1
-
-groups = Internet/P2P
-url = http://libtorrent.rakshasa.no/
-license = GPLv3
-summary = BitTorrent client based on libtorrent.
-
-description
- A BitTorrent client using libtorrent, which on high-bandwidth connections is
- able to seed at 3 times the speed of the official client. Using
- ncurses its ideal for use with screen or dtach. It supports
- saving of sessions and allows the user to add and remove torrents and scanning
- of directories for torrent files to seed and/or download.
-end
-
-source_dl = http://libtorrent.rakshasa.no/downloads/
-
-build
- requires
- gcc-c++
- libcurl-devel
- libsigc++-devel
- libtorrent-devel >= 0.12.9
- ncurses-devel
- end
-
- CFLAGS += -fno-strict-aliasing
-
- make_build_targets += LDFLAGS=-lpthread
-end
-
-packages
- package %{name}
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/vlan/vlan.nm b/vlan/vlan.nm
deleted file mode 100644
index 6ee0ebe..0000000
--- a/vlan/vlan.nm
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = vlan
-version = 1.9
-release = 2
-
-groups = Networking/Tools
-url = http://www.candelatech.com/~greear/vlan.html
-license = GPLv2+
-summary = Linux 802.1q VLAN configuration utility.
-
-description
- The vconfig program configures and adjusts 802.1q VLAN parameters.
-end
-
-source_dl = http://www.candelatech.com/~greear/vlan/
-
-DIR_APP = %{DIR_SRC}/%{name}
-
-build
- # Parallelism cannot be used here.
- PARALLELISMFLAGS = -j1
-
- prepare_cmds
- make purge
- end
-
- make_build_targets = vconfig CCFLAGS="%{CFLAGS}" STRIP=/bin/true
-
- install
- mkdir -pv %{BUILDROOT}%{sbindir}
- install -D -m 0755 vconfig %{BUILDROOT}%{sbindir}
-
- mkdir -pv %{BUILDROOT}%{mandir}/man8
- install -D -m 0644 vconfig.8 %{BUILDROOT}%{mandir}/man8
- end
-end
-
-packages
- package %{name}
-
- 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:[~2016-09-27 16:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-27 16:25 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. c5facb1d4163b7633f0e5e5fcd3eae07f92276a0 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox