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 6738176b82a737a450253b17eac954fa130f111b (commit) via ac21b78bccdcdbdd2ebcd2678cc59832424dd5a1 (commit) via df7a686f3030321cf6e4a7fe56e1bf2184d2b14d (commit) via e8a2ae3ab246522bfa0acdf4148733792292ddf5 (commit) via f506ea29dce9cb882237b0576a15a144df79e1ee (commit) via 7ae2a692f77b1b8039bfe421bc336d4ede37702a (commit) via 53edf6329a0be2d64a38461774ff1ed464409c73 (commit) via 8397bf5c485d92462277509bdd7fe43b90b0a770 (commit) via 5a7333036757023efbf54d4dd02690ec8717f0aa (commit) via e1b4e4adcae77b4e272bc7533312cb316983ec5d (commit) via 00414c2b75032a2259d870b8d6a263d3a1ac76de (commit) via 309d0e55844f001a6f582997dc270815b5d20ef1 (commit) via 023929365bc133c618e44ed1b433f356e7771fb0 (commit) via 7dd6962e327177b394f38dab3b33379886fc0e12 (commit) via 165d2feb796f865a0f173cdd333c537118d14329 (commit) via ed3dc63fabab2d6b0f1f38fc8ccac42474d968f5 (commit) via 51e23103c1aa1ca4618fa19e7756d34fc651f113 (commit) via 01a0e3cdcc32a976550e4c2026755a6700c56d9a (commit) via 6c0a0a49c262823d5931114bdf2fe1a0734933c1 (commit) via 48bd5015b1ab1b7772d253d98e516eb7e31e1cc1 (commit) via 974699b4a0fef2ba0c7c2a5a0ba54f535deaa23b (commit) via e6b799745d42e021e5687fce69416a0165e5759f (commit) via 6b38ee9a0ede0ee3a8187bf5716eb27bf6992367 (commit) via 6c9ff46b829d75303a1f3ac69640f0a20868d735 (commit) via 9d31794a32db1f7fb7f4e170dedd50ff04ff56f1 (commit) from f85ecfc4fe5b6b953c08009378f9783aef21b0bc (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 6738176b82a737a450253b17eac954fa130f111b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 14:32:55 2011 +0200
shadow-utils: Fix package replacement.
commit ac21b78bccdcdbdd2ebcd2678cc59832424dd5a1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 14:32:08 2011 +0200
perl: Enable testsuite.
commit df7a686f3030321cf6e4a7fe56e1bf2184d2b14d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 14:30:53 2011 +0200
python: Fix build.
Fixes #235.
commit e8a2ae3ab246522bfa0acdf4148733792292ddf5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 13:53:42 2011 +0200
perl: Fix dependency problem with perl(Carp).
commit f506ea29dce9cb882237b0576a15a144df79e1ee Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 13:53:24 2011 +0200
perl-libwww-perl: Fix build.
commit 7ae2a692f77b1b8039bfe421bc336d4ede37702a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 13:32:30 2011 +0200
net-snmp: Fix build issue with perl modules.
commit 53edf6329a0be2d64a38461774ff1ed464409c73 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 13:32:07 2011 +0200
gnupg2: Update to 2.0.18.
Fixes #242.
commit 8397bf5c485d92462277509bdd7fe43b90b0a770 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 13:31:26 2011 +0200
python-gudev: Fix build.
Fixes #236.
commit 5a7333036757023efbf54d4dd02690ec8717f0aa Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 12:55:28 2011 +0200
perl: Update to 5.14.2.
Fixes #239.
commit e1b4e4adcae77b4e272bc7533312cb316983ec5d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 11:42:34 2011 +0200
perl-Test-Simple: Remove package because this has ever been in perl itself.
commit 00414c2b75032a2259d870b8d6a263d3a1ac76de Merge: 309d0e5 e6b7997 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:15:14 2011 +0200
Merge remote-tracking branch 'arne_f/Net-SNMP-5.7.1'
commit 309d0e55844f001a6f582997dc270815b5d20ef1 Merge: 0239293 6b38ee9 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:15:08 2011 +0200
Merge remote-tracking branch 'arne_f/diffutils-3.2'
commit 023929365bc133c618e44ed1b433f356e7771fb0 Merge: 7dd6962 9d31794 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:11:34 2011 +0200
Merge remote-tracking branch 'stevee/file'
commit 7dd6962e327177b394f38dab3b33379886fc0e12 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:09:25 2011 +0200
util-linux: Update filter_requires.
commit 165d2feb796f865a0f173cdd333c537118d14329 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:08:56 2011 +0200
squid: Replace filter_requires.
And a small buildfix with new GCC.
commit ed3dc63fabab2d6b0f1f38fc8ccac42474d968f5 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:08:20 2011 +0200
paxtest: Update filter_requires.
commit 51e23103c1aa1ca4618fa19e7756d34fc651f113 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:08:07 2011 +0200
pakfire: Update to 0.9.12.
commit 01a0e3cdcc32a976550e4c2026755a6700c56d9a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:07:51 2011 +0200
mc: Update filter_requires.
commit 6c0a0a49c262823d5931114bdf2fe1a0734933c1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:07:36 2011 +0200
ebtables: Replace filter_requires.
commit 48bd5015b1ab1b7772d253d98e516eb7e31e1cc1 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:05:17 2011 +0200
cairo: Rebuild without linking against binutils devel libs.
commit 974699b4a0fef2ba0c7c2a5a0ba54f535deaa23b Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 6 01:04:52 2011 +0200
binutils: Add devel package to exclude development libraries.
commit e6b799745d42e021e5687fce69416a0165e5759f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 5 13:34:59 2011 +0200
Net-SNMP: Update to 5.7.1.
Fixes #253
commit 6b38ee9a0ede0ee3a8187bf5716eb27bf6992367 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed Oct 5 13:11:53 2011 +0200
diffutils: Update to 3.2.
Fixes #240
commit 6c9ff46b829d75303a1f3ac69640f0a20868d735 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 4 00:15:05 2011 +0200
pakfire: Update to 0.9.11.
commit 9d31794a32db1f7fb7f4e170dedd50ff04ff56f1 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Oct 3 19:43:36 2011 +0200
file: Update to 5.09.
Fixes #245
-----------------------------------------------------------------------
Summary of changes: binutils/binutils.nm | 5 +- cairo/cairo.nm | 6 +- diffutils/diffutils.nm | 4 +- .../patches/diffutils-2.8.1-hardened_tmp-1.patch | 31 - diffutils/patches/diffutils-2.9-i18n-1.patch | 768 ---------------- diffutils/patches/diffutils-cmp-s-empty.patch | 20 + ebtables/ebtables.nm | 7 +- file/file.nm | 4 +- gnupg2/gnupg2.nm | 5 +- mc/mc.nm | 10 +- net-snmp/net-snmp.nm | 12 +- pakfire/pakfire.nm | 4 +- paxtest/paxtest.nm | 7 +- perl-Test-Simple/perl-Test-Simple.nm | 42 - perl-libwww-perl/perl-libwww-perl.nm | 32 +- perl/perl.nm | 945 ++++++++++++++------ python-gudev/python-gudev.nm | 6 +- python/python.nm | 10 +- shadow-utils/shadow-utils.nm | 6 +- squid/squid.nm | 8 +- util-linux/util-linux.nm | 6 +- 21 files changed, 771 insertions(+), 1167 deletions(-) delete mode 100644 diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch delete mode 100644 diffutils/patches/diffutils-2.9-i18n-1.patch create mode 100644 diffutils/patches/diffutils-cmp-s-empty.patch delete mode 100644 perl-Test-Simple/perl-Test-Simple.nm
Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index f8c808e..bb6919a 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -5,7 +5,7 @@
name = binutils version = 2.21.51.0.8 -release = 1 +release = 2
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Tools @@ -75,5 +75,8 @@ end
packages package %{name} + + package %{name}-devel + template DEVEL end end diff --git a/cairo/cairo.nm b/cairo/cairo.nm index af94c84..ed393a3 100644 --- a/cairo/cairo.nm +++ b/cairo/cairo.nm @@ -5,7 +5,7 @@
name = cairo version = 1.10.2 -release = 2 +release = 3
groups = System/Graphics url = http://cairographics.org @@ -21,6 +21,7 @@ source_dl = http://cairographics.org/releases/
build requires + binutils>=2.21.51.0.8-2 fontconfig-devel freetype-devel libpng-devel @@ -32,8 +33,7 @@ end
packages package %{name} - end - + package %{name}-devel template DEVEL diff --git a/diffutils/diffutils.nm b/diffutils/diffutils.nm index 1fa2b4f..6d575c6 100644 --- a/diffutils/diffutils.nm +++ b/diffutils/diffutils.nm @@ -4,7 +4,7 @@ ###############################################################################
name = diffutils -version = 3.0 +version = 3.2 release = 1
groups = Base Build Development/Tools @@ -19,7 +19,7 @@ description cmp can show the characters that differ between the two files. end
-source_dl = +source_dl = http://ftp.gnu.org/gnu/diffutils/
build configure_options += \ diff --git a/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch b/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch deleted file mode 100644 index c335090..0000000 --- a/diffutils/patches/diffutils-2.8.1-hardened_tmp-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2006-10-09 -Initial Package Version: 2.8.7 -Upstream Status: Submitted - Partially accepted -Thread starts here: - http://sources.redhat.com/ml/bug-gnu-utils/2000-12/msg00163.html -Origin: ALT Linux / Openwall Owl Linux - diffutils-2.8.7-alt-tmp.diff -Description: This patch removes the more portable and less safe use of -tmpname(3), in preference of mkstemp(3). - ---- diffutils-2.8.7/src/sdiff.c.orig 2004-04-12 07:44:35 +0000 -+++ diffutils-2.8.7/src/sdiff.c 2005-05-17 12:58:44 +0000 -@@ -990,13 +990,13 @@ edit (struct line_filter *left, char con - int fd; - - if (tmpname) -- tmp = fopen (tmpname, "w"); -- else - { -- if ((fd = temporary_file ()) < 0) -- perror_fatal ("mkstemp"); -- tmp = fdopen (fd, "w"); -+ unlink (tmpname); -+ free (tmpname); - } -+ if ((fd = temporary_file ()) < 0) -+ perror_fatal ("mkstemp"); -+ tmp = fdopen (fd, "w"); - - if (! tmp) - perror_fatal (tmpname); diff --git a/diffutils/patches/diffutils-2.9-i18n-1.patch b/diffutils/patches/diffutils-2.9-i18n-1.patch deleted file mode 100644 index b6f12ef..0000000 --- a/diffutils/patches/diffutils-2.9-i18n-1.patch +++ /dev/null @@ -1,768 +0,0 @@ ---- diffutils-2.9/src/diff.c 2010-02-11 10:39:17.000000000 +0100 -+++ diffutils-2.9.mod/src/diff.c 2010-02-13 15:28:22.268208253 +0100 -@@ -284,6 +284,13 @@ - re_set_syntax (RE_SYNTAX_GREP | RE_NO_POSIX_BACKTRACKING); - excluded = new_exclude (); - -+#ifdef HANDLE_MULTIBYTE -+ if (MB_CUR_MAX > 1) -+ lines_differ = lines_differ_multibyte; -+ else -+#endif -+ lines_differ = lines_differ_singlebyte; -+ - /* Decode the options. */ - - while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1) ---- diffutils-2.9/src/diff.h 2010-02-11 10:05:57.000000000 +0100 -+++ diffutils-2.9.mod/src/diff.h 2010-02-13 15:28:22.269208190 +0100 -@@ -23,6 +23,19 @@ - #include <stdio.h> - #include <unlocked-io.h> - -+/* For platform which support the ISO C amendement 1 functionality we -+ support user defined character classes. */ -+#if defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H -+/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */ -+# include <wchar.h> -+# include <wctype.h> -+# if defined (HAVE_MBRTOWC) -+# define HANDLE_MULTIBYTE 1 -+# endif -+#endif -+ -+#define TAB_WIDTH 8 -+ - /* What kind of changes a hunk contains. */ - enum changes - { -@@ -350,7 +363,13 @@ - extern char const pr_program[]; - char *concat (char const *, char const *, char const *); - char *dir_file_pathname (char const *, char const *); --bool lines_differ (char const *, char const *); -+ -+bool (*lines_differ) (char const *, char const *); -+bool lines_differ_singlebyte (char const *, char const *); -+#ifdef HANDLE_MULTIBYTE -+bool lines_differ_multibyte (char const *, char const *); -+#endif -+ - lin translate_line_number (struct file_data const *, lin); - struct change *find_change (struct change *); - struct change *find_reverse_change (struct change *); ---- diffutils-2.9/src/io.c 2010-02-05 09:10:15.000000000 +0100 -+++ diffutils-2.9.mod/src/io.c 2010-02-13 15:39:59.313224273 +0100 -@@ -22,6 +22,7 @@ - #include <cmpbuf.h> - #include <file-type.h> - #include <xalloc.h> -+#include <assert.h> - - /* Rotate an unsigned value to the left. */ - #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n))) -@@ -194,6 +195,28 @@ - - /* Split the file into lines, simultaneously computing the equivalence - class for each line. */ -+#ifdef HANDLE_MULTIBYTE -+# define MBC2WC(P, END, MBLENGTH, WC, STATE, CONVFAIL) \ -+do \ -+{ \ -+ mbstate_t state_bak = STATE; \ -+ \ -+ CONVFAIL = 0; \ -+ MBLENGTH = mbrtowc (&WC, P, END - (char const *)P, &STATE); \ -+ \ -+ switch (MBLENGTH) \ -+ { \ -+ case (size_t)-2: \ -+ case (size_t)-1: \ -+ STATE = state_bak; \ -+ ++CONVFAIL; \ -+ /* Fall through. */ \ -+ case 0: \ -+ MBLENGTH = 1; \ -+ } \ -+} \ -+while (0) -+#endif - - static void - find_and_hash_each_line (struct file_data *current) -@@ -220,12 +243,282 @@ - bool same_length_diff_contents_compare_anyway = - diff_length_compare_anyway | ignore_case; - -+#ifdef HANDLE_MULTIBYTE -+ wchar_t wc; -+ size_t mblength; -+ mbstate_t state; -+ int convfail; -+ -+ memset (&state, '\0', sizeof (mbstate_t)); -+#endif -+ - while (p < suffix_begin) - { - char const *ip = p; - - h = 0; - -+#ifdef HANDLE_MULTIBYTE -+ if (MB_CUR_MAX > 1) -+ { -+ wchar_t lo_wc; -+ char mbc[MB_LEN_MAX]; -+ mbstate_t state_wc; -+ -+ /* Hash this line until we find a newline. */ -+ switch (ignore_white_space) -+ { -+ case IGNORE_ALL_SPACE: -+ while (1) -+ { -+ if (*p == '\n') -+ { -+ ++p; -+ break; -+ } -+ -+ MBC2WC (p, suffix_begin, mblength, wc, state, convfail); -+ -+ if (convfail) -+ mbc[0] = *p++; -+ else if (!iswspace (wc)) -+ { -+ bool flag = 0; -+ -+ if (ignore_case) -+ { -+ lo_wc = towlower (wc); -+ if (lo_wc != wc) -+ { -+ flag = 1; -+ -+ p += mblength; -+ memset (&state_wc, '\0', sizeof(mbstate_t)); -+ mblength = wcrtomb (mbc, lo_wc, &state_wc); -+ -+ assert (mblength != (size_t)-1 && -+ mblength != (size_t)-2); -+ -+ mblength = (mblength < 1) ? 1 : mblength; -+ } -+ } -+ -+ if (!flag) -+ { -+ for (i = 0; i < mblength; i++) -+ mbc[i] = *p++; -+ } -+ } -+ else -+ { -+ p += mblength; -+ continue; -+ } -+ -+ for (i = 0; i < mblength; i++) -+ h = HASH (h, mbc[i]); -+ } -+ break; -+ -+ case IGNORE_SPACE_CHANGE: -+ while (1) -+ { -+ if (*p == '\n') -+ { -+ ++p; -+ break; -+ } -+ -+ MBC2WC (p, suffix_begin, mblength, wc, state, convfail); -+ -+ if (!convfail && iswspace (wc)) -+ { -+ while (1) -+ { -+ if (*p == '\n') -+ { -+ ++p; -+ goto hashing_done; -+ } -+ -+ p += mblength; -+ MBC2WC (p, suffix_begin, mblength, wc, state, convfail); -+ if (convfail || (!convfail && !iswspace (wc))) -+ break; -+ } -+ h = HASH (h, ' '); -+ } -+ -+ /* WC is now the first non-space. */ -+ if (convfail) -+ mbc[0] = *p++; -+ else -+ { -+ bool flag = 0; -+ -+ if (ignore_case) -+ { -+ lo_wc = towlower (wc); -+ if (lo_wc != wc) -+ { -+ flag = 1; -+ -+ p += mblength; -+ memset (&state_wc, '\0', sizeof(mbstate_t)); -+ mblength = wcrtomb (mbc, lo_wc, &state_wc); -+ -+ assert (mblength != (size_t)-1 && -+ mblength != (size_t)-2); -+ -+ mblength = (mblength < 1) ? 1 : mblength; -+ } -+ } -+ -+ if (!flag) -+ { -+ for (i = 0; i < mblength; i++) -+ mbc[i] = *p++; -+ } -+ } -+ -+ for (i = 0; i < mblength; i++) -+ h = HASH (h, mbc[i]); -+ } -+ break; -+ -+ case IGNORE_TAB_EXPANSION: -+ { -+ size_t column = 0; -+ -+ while (1) -+ { -+ if (*p == '\n') -+ { -+ ++p; -+ break; -+ } -+ -+ MBC2WC (p, suffix_begin, mblength, wc, state, convfail); -+ -+ if (convfail) -+ { -+ h = HASH (h, *p++); -+ ++column; -+ } -+ else -+ { -+ bool flag; -+ -+ switch (wc) -+ { -+ case L'\b': -+ column -= 0 < column; -+ h = HASH (h, '\b'); -+ ++p; -+ break; -+ -+ case L'\t': -+ { -+ int repetitions; -+ -+ repetitions = TAB_WIDTH - column % TAB_WIDTH; -+ column += repetitions; -+ do -+ h = HASH (h, ' '); -+ while (--repetitions != 0); -+ ++p; -+ } -+ break; -+ -+ case L'\r': -+ column = 0; -+ h = HASH (h, '\r'); -+ ++p; -+ break; -+ -+ default: -+ flag = 0; -+ column += wcwidth (wc); -+ if (ignore_case) -+ { -+ lo_wc = towlower (wc); -+ if (lo_wc != wc) -+ { -+ flag = 1; -+ p += mblength; -+ memset (&state_wc, '\0', sizeof(mbstate_t)); -+ mblength = wcrtomb (mbc, lo_wc, &state_wc); -+ -+ assert (mblength != (size_t)-1 && -+ mblength != (size_t)-2); -+ -+ mblength = (mblength < 1) ? 1 : mblength; -+ } -+ } -+ -+ if (!flag) -+ { -+ for (i = 0; i < mblength; i++) -+ mbc[i] = *p++; -+ } -+ -+ for (i = 0; i < mblength; i++) -+ h = HASH (h, mbc[i]); -+ } -+ } -+ } -+ } -+ break; -+ -+ default: -+ while (1) -+ { -+ if (*p == '\n') -+ { -+ ++p; -+ break; -+ } -+ -+ MBC2WC (p, suffix_begin, mblength, wc, state, convfail); -+ -+ if (convfail) -+ mbc[0] = *p++; -+ else -+ { -+ int flag = 0; -+ -+ if (ignore_case) -+ { -+ lo_wc = towlower (wc); -+ if (lo_wc != wc) -+ { -+ flag = 1; -+ p += mblength; -+ memset (&state_wc, '\0', sizeof(mbstate_t)); -+ mblength = wcrtomb (mbc, lo_wc, &state_wc); -+ -+ assert (mblength != (size_t)-1 && -+ mblength != (size_t)-2); -+ -+ mblength = (mblength < 1) ? 1 : mblength; -+ } -+ } -+ -+ if (!flag) -+ { -+ for (i = 0; i < mblength; i++) -+ mbc[i] = *p++; -+ } -+ } -+ -+ for (i = 0; i < mblength; i++) -+ h = HASH (h, mbc[i]); -+ } -+ } -+ } -+ else -+#endif -+ - /* Hash this line until we find a newline. */ - if (ignore_case) - switch (ignore_white_space) ---- diffutils-2.9/src/side.c 2010-02-05 09:10:15.000000000 +0100 -+++ diffutils-2.9.mod/src/side.c 2010-02-13 15:51:32.647221551 +0100 -@@ -77,11 +77,74 @@ - register char const *text_limit = line[1]; - mbstate_t mbstate = { 0 }; - -+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H -+ unsigned char mbc[MB_LEN_MAX]; -+ wchar_t wc; -+ mbstate_t state, state_bak; -+ size_t mbc_pos, mblength; -+ int mbc_loading_flag = 0; -+ int wc_width; -+ -+ memset (&state, '\0', sizeof (mbstate_t)); -+#endif -+ - while (text_pointer < text_limit) - { - char const *tp0 = text_pointer; - register char c = *text_pointer++; - -+#if defined HAVE_WCHAR_H && defined HAVE_WCTYPE_H -+ if (MB_CUR_MAX > 1 && mbc_loading_flag) -+ { -+ mbc_loading_flag = 0; -+ state_bak = state; -+ mbc[mbc_pos++] = c; -+ -+process_mbc: -+ mblength = mbrtowc (&wc, mbc, mbc_pos, &state); -+ -+ switch (mblength) -+ { -+ case (size_t)-2: /* Incomplete multibyte character. */ -+ mbc_loading_flag = 1; -+ state = state_bak; -+ break; -+ -+ case (size_t)-1: /* Invalid as a multibyte character. */ -+ if (in_position++ < out_bound) -+ { -+ out_position = in_position; -+ putc (mbc[0], out); -+ } -+ memmove (mbc, mbc + 1, --mbc_pos); -+ if (mbc_pos > 0) -+ { -+ mbc[mbc_pos] = '\0'; -+ goto process_mbc; -+ } -+ break; -+ -+ default: -+ wc_width = wcwidth (wc); -+ if (wc_width < 1) /* Unprintable multibyte character. */ -+ { -+ if (in_position <= out_bound) -+ fprintf (out, "%lc", (wint_t)wc); -+ } -+ else /* Printable multibyte character. */ -+ { -+ in_position += wc_width; -+ if (in_position <= out_bound) -+ { -+ out_position = in_position; -+ fprintf (out, "%lc", (wint_t)wc); -+ } -+ } -+ } -+ continue; -+ } -+#endif -+ - switch (c) - { - case '\t': ---- diffutils-2.9/src/util.c 2010-02-11 10:39:17.000000000 +0100 -+++ diffutils-2.9.mod/src/util.c 2010-02-13 16:08:16.065232588 +0100 -@@ -309,7 +309,7 @@ - - outfile = 0; - } -- -+ - /* Compare two lines (typically one from each input file) - according to the command line options. - For efficiency, this is invoked only when the lines do not match exactly -@@ -317,7 +317,7 @@ - Return nonzero if the lines differ. */ - - bool --lines_differ (char const *s1, char const *s2) -+lines_differ_singlebyte (char const *s1, char const *s2) - { - register char const *t1 = s1; - register char const *t2 = s2; -@@ -446,7 +446,294 @@ - - return true; - } -- -+ -+#ifdef HANDLE_MULTIBYTE -+# define MBC2WC(T, END, MBLENGTH, WC, STATE, CONVFAIL) \ -+do \ -+{ \ -+ mbstate_t bak = STATE; \ -+ \ -+ CONVFAIL = 0; \ -+ MBLENGTH = mbrtowc (&WC, T, END - T, &STATE); \ -+ \ -+ switch (MBLENGTH) \ -+ { \ -+ case (size_t)-2: \ -+ case (size_t)-1: \ -+ STATE = bak; \ -+ ++CONVFAIL; \ -+ /* Fall through. */ \ -+ case 0: \ -+ MBLENGTH = 1; \ -+ } \ -+} \ -+while (0) -+ -+bool -+lines_differ_multibyte (char const *s1, char const *s2) -+{ -+ unsigned char const *end1, *end2; -+ unsigned char c1, c2; -+ wchar_t wc1, wc2, wc1_bak, wc2_bak; -+ size_t mblen1, mblen2; -+ mbstate_t state1, state2, state1_bak, state2_bak; -+ int convfail1, convfail2, convfail1_bak, convfail2_bak; -+ -+ unsigned char const *t1 = (unsigned char const *) s1; -+ unsigned char const *t2 = (unsigned char const *) s2; -+ unsigned char const *t1_bak, *t2_bak; -+ size_t column = 0; -+ -+ if (ignore_white_space == IGNORE_NO_WHITE_SPACE && !ignore_case) -+ { -+ while (*t1 != '\n') -+ if (*t1++ != * t2++) -+ return 1; -+ return 0; -+ } -+ -+ memset (&state1, '\0', sizeof (mbstate_t)); -+ memset (&state2, '\0', sizeof (mbstate_t)); -+ -+ end1 = s1 + strlen (s1); -+ end2 = s2 + strlen (s2); -+ -+ while (1) -+ { -+ c1 = *t1; -+ c2 = *t2; -+ MBC2WC (t1, end1, mblen1, wc1, state1, convfail1); -+ MBC2WC (t2, end2, mblen2, wc2, state2, convfail2); -+ -+ /* Test for exact char equality first, since it's a common case. */ -+ if (convfail1 ^ convfail2) -+ break; -+ else if (convfail1 && convfail2 && c1 != c2) -+ break; -+ else if (!convfail1 && !convfail2 && wc1 != wc2) -+ { -+ switch (ignore_white_space) -+ { -+ case IGNORE_ALL_SPACE: -+ /* For -w, just skip past any white space. */ -+ while (1) -+ { -+ if (convfail1) -+ break; -+ else if (wc1 == L'\n' || !iswspace (wc1)) -+ break; -+ -+ t1 += mblen1; -+ c1 = *t1; -+ MBC2WC (t1, end1, mblen1, wc1, state1, convfail1); -+ } -+ -+ while (1) -+ { -+ if (convfail2) -+ break; -+ else if (wc2 == L'\n' || !iswspace (wc2)) -+ break; -+ -+ t2 += mblen2; -+ c2 = *t2; -+ MBC2WC (t2, end2, mblen2, wc2, state2, convfail2); -+ } -+ t1 += mblen1; -+ t2 += mblen2; -+ break; -+ -+ case IGNORE_SPACE_CHANGE: -+ /* For -b, advance past any sequence of white space in -+ line 1 and consider it just one space, or nothing at -+ all if it is at the end of the line. */ -+ if (wc1 != L'\n' && iswspace (wc1)) -+ { -+ size_t mblen_bak; -+ mbstate_t state_bak; -+ -+ do -+ { -+ t1 += mblen1; -+ mblen_bak = mblen1; -+ state_bak = state1; -+ MBC2WC (t1, end1, mblen1, wc1, state1, convfail1); -+ } -+ while (!convfail1 && (wc1 != L'\n' && iswspace (wc1))); -+ -+ state1 = state_bak; -+ mblen1 = mblen_bak; -+ t1 -= mblen1; -+ convfail1 = 0; -+ wc1 = L' '; -+ } -+ -+ /* Likewise for line 2. */ -+ if (wc2 != L'\n' && iswspace (wc2)) -+ { -+ size_t mblen_bak; -+ mbstate_t state_bak; -+ -+ do -+ { -+ t2 += mblen2; -+ mblen_bak = mblen2; -+ state_bak = state2; -+ MBC2WC (t2, end2, mblen2, wc2, state2, convfail2); -+ } -+ while (!convfail2 && (wc2 != L'\n' && iswspace (wc2))); -+ -+ state2 = state_bak; -+ mblen2 = mblen_bak; -+ t2 -= mblen2; -+ convfail2 = 0; -+ wc2 = L' '; -+ } -+ -+ if (wc1 != wc2) -+ { -+ if (wc2 == L' ' && wc1 != L'\n' && -+ t1 > (unsigned char const *)s1 && -+ !convfail1_bak && iswspace (wc1_bak)) -+ { -+ t1 = t1_bak; -+ wc1 = wc1_bak; -+ state1 = state1_bak; -+ convfail1 = convfail1_bak; -+ continue; -+ } -+ if (wc1 == L' ' && wc2 != L'\n' -+ && t2 > (unsigned char const *)s2 -+ && !convfail2_bak && iswspace (wc2_bak)) -+ { -+ t2 = t2_bak; -+ wc2 = wc2_bak; -+ state2 = state2_bak; -+ convfail2 = convfail2_bak; -+ continue; -+ } -+ } -+ -+ t1_bak = t1; t2_bak = t2; -+ wc1_bak = wc1; wc2_bak = wc2; -+ state1_bak = state1; state2_bak = state2; -+ convfail1_bak = convfail1; convfail2_bak = convfail2; -+ -+ if (wc1 == L'\n') -+ wc1 = L' '; -+ else -+ t1 += mblen1; -+ -+ if (wc2 == L'\n') -+ wc2 = L' '; -+ else -+ t2 += mblen2; -+ -+ break; -+ -+ case IGNORE_TAB_EXPANSION: -+ if ((wc1 == L' ' && wc2 == L'\t') -+ || (wc1 == L'\t' && wc2 == L' ')) -+ { -+ size_t column2 = column; -+ -+ while (1) -+ { -+ if (convfail1) -+ { -+ ++t1; -+ break; -+ } -+ else if (wc1 == L' ') -+ column++; -+ else if (wc1 == L'\t') -+ column += TAB_WIDTH - column % TAB_WIDTH; -+ else -+ { -+ t1 += mblen1; -+ break; -+ } -+ -+ t1 += mblen1; -+ c1 = *t1; -+ MBC2WC (t1, end1, mblen1, wc1, state1, convfail1); -+ } -+ -+ while (1) -+ { -+ if (convfail2) -+ { -+ ++t2; -+ break; -+ } -+ else if (wc2 == L' ') -+ column2++; -+ else if (wc2 == L'\t') -+ column2 += TAB_WIDTH - column2 % TAB_WIDTH; -+ else -+ { -+ t2 += mblen2; -+ break; -+ } -+ -+ t2 += mblen2; -+ c2 = *t2; -+ MBC2WC (t2, end2, mblen2, wc2, state2, convfail2); -+ } -+ -+ if (column != column2) -+ return 1; -+ } -+ else -+ { -+ t1 += mblen1; -+ t2 += mblen2; -+ } -+ break; -+ -+ case IGNORE_NO_WHITE_SPACE: -+ t1 += mblen1; -+ t2 += mblen2; -+ break; -+ } -+ -+ /* Lowercase all letters if -i is specified. */ -+ if (ignore_case) -+ { -+ if (!convfail1) -+ wc1 = towlower (wc1); -+ if (!convfail2) -+ wc2 = towlower (wc2); -+ } -+ -+ if (convfail1 ^ convfail2) -+ break; -+ else if (convfail1 && convfail2 && c1 != c2) -+ break; -+ else if (!convfail1 && !convfail2 && wc1 != wc2) -+ break; -+ } -+ else -+ { -+ t1_bak = t1; t2_bak = t2; -+ wc1_bak = wc1; wc2_bak = wc2; -+ state1_bak = state1; state2_bak = state2; -+ convfail1_bak = convfail1; convfail2_bak = convfail2; -+ -+ t1 += mblen1; t2 += mblen2; -+ } -+ -+ if (!convfail1 && wc1 == L'\n') -+ return 0; -+ -+ column += convfail1 ? 1 : -+ (wc1 == L'\t') ? TAB_WIDTH - column % TAB_WIDTH : wcwidth (wc1); -+ } -+ -+ return 1; -+} -+#endif -+ - /* Find the consecutive changes at the start of the script START. - Return the last link before the first gap. */ - diff --git a/diffutils/patches/diffutils-cmp-s-empty.patch b/diffutils/patches/diffutils-cmp-s-empty.patch new file mode 100644 index 0000000..bc1c6b4 --- /dev/null +++ b/diffutils/patches/diffutils-cmp-s-empty.patch @@ -0,0 +1,20 @@ +diff -up diffutils-2.8.1/src/cmp.c.cmp-s-empty diffutils-2.8.1/src/cmp.c +--- diffutils-2.8.1/src/cmp.c.cmp-s-empty 2002-04-05 21:37:31.000000000 +0100 ++++ diffutils-2.8.1/src/cmp.c 2010-06-25 14:56:08.464802321 +0100 +@@ -316,12 +316,15 @@ main (int argc, char **argv) + + /* If only a return code is needed, + and if both input descriptors are associated with plain files, ++ and if both files are larger than 0 bytes (procfs files are always 0), + conclude that the files differ if they have different sizes + and if more bytes will be compared than are in the smaller file. */ + + if (comparison_type == type_status + && S_ISREG (stat_buf[0].st_mode) +- && S_ISREG (stat_buf[1].st_mode)) ++ && S_ISREG (stat_buf[1].st_mode) ++ && stat_buf[0].st_size > 0 ++ && stat_buf[1].st_size > 0) + { + off_t s0 = stat_buf[0].st_size - file_position (0); + off_t s1 = stat_buf[1].st_size - file_position (1); diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm index 2539b25..212bf7b 100644 --- a/ebtables/ebtables.nm +++ b/ebtables/ebtables.nm @@ -5,7 +5,7 @@
name = ebtables version = v2.0.9-2 -release = 1 +release = 2
groups = Networking/Tools url = http://ebtables.sourceforge.net/ @@ -35,8 +35,6 @@ build
rm -vfr %{BUILDROOT}/etc/{init.d,sysconfig} end - - export PKG_REQUIRES_FILTER = libebt end
quality-agent @@ -47,5 +45,8 @@ end
packages package %{name} + filter_requires + libebt + end end end diff --git a/file/file.nm b/file/file.nm index c193681..d34169b 100644 --- a/file/file.nm +++ b/file/file.nm @@ -4,7 +4,7 @@ ###############################################################################
name = file -version = 5.07 +version = 5.09 release = 1
groups = Base Build System/Tools @@ -19,7 +19,7 @@ description different graphics formats. end
-source_dl = +source_dl = ftp://ftp.astron.com/pub/file/
build requires diff --git a/gnupg2/gnupg2.nm b/gnupg2/gnupg2.nm index 8e35ca8..6623359 100644 --- a/gnupg2/gnupg2.nm +++ b/gnupg2/gnupg2.nm @@ -4,7 +4,7 @@ ###############################################################################
name = gnupg -version = 2.0.17 +version = 2.0.18 release = 1
groups = Security/Tools @@ -20,7 +20,7 @@ description standard as described by several RFCs. end
-source_dl = +source_dl = ftp://ftp.gnupg.org/gcrypt/gnupg/ sources = %{thisapp}.tar.bz2
build @@ -41,5 +41,4 @@ end
packages package %{name} - end end diff --git a/mc/mc.nm b/mc/mc.nm index dee107d..975c501 100644 --- a/mc/mc.nm +++ b/mc/mc.nm @@ -5,7 +5,7 @@
name = mc version = 4.7.4 -release = 1 +release = 2
groups = Applications/System url = http://www.ibiblio.org/mc/ @@ -32,9 +32,6 @@ build slang-devel end
- # This awkward dependency is found and cannot be resolved. - PKG_REQUIRES_FILTER = perl(pieces) - configure_options += \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -51,4 +48,9 @@ end
packages package %{name} + # This awkward dependency is found and cannot be resolved. + filter_requires + perl(pieces) + end + end end diff --git a/net-snmp/net-snmp.nm b/net-snmp/net-snmp.nm index 18771d3..351662a 100644 --- a/net-snmp/net-snmp.nm +++ b/net-snmp/net-snmp.nm @@ -4,8 +4,8 @@ ###############################################################################
name = net-snmp -version = 5.7 -release = 1 +version = 5.7.1 +release = 2
groups = Networking/Daemons url = http://net-snmp.sourceforge.net @@ -18,7 +18,7 @@ description computer equipment and even devices like UPSs. end
-source_dl = +source_dl = https://sourceforge.net/projects/net-snmp/files/net-snmp/%%7Bversion%7D/
build requires @@ -48,6 +48,12 @@ end
packages package %{name} + # XXX Although we don't want to build perl modules, + # we have this requirement?! + filter_requires + perl(NetSNMP::TrapReceiver) + end + end
package %{name}-libs template LIBS diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index ed34cde..98b742a 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pakfire -version = 0.9.10 -release = 2 +version = 0.9.12 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging diff --git a/paxtest/paxtest.nm b/paxtest/paxtest.nm index 925b717..f99c40d 100644 --- a/paxtest/paxtest.nm +++ b/paxtest/paxtest.nm @@ -5,7 +5,7 @@
name = paxtest version = 0.9.9 -release = 2 +release = 3
groups = Security/Tools url = http://pax.grsecurity.org/ @@ -31,7 +31,6 @@ build RUNDIR=/usr/lib/paxtest BINDIR=/usr/bin end
- export PKG_REQUIRES_FILTER = shlibtest end
quality-agent @@ -42,4 +41,8 @@ end
packages package %{name} + filter_requires + shlibtest + end + end end diff --git a/perl-Test-Simple/perl-Test-Simple.nm b/perl-Test-Simple/perl-Test-Simple.nm deleted file mode 100644 index d70a35b..0000000 --- a/perl-Test-Simple/perl-Test-Simple.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = Test-Simple -version = 0.98 -release = 1 -arch = noarch - -groups = Development/Libratries -url = http://search.cpan.org/dist/Test-Simple/ -license = GPL+ or Artistic -summary = Basic utilities for writing tests. - -description - This package provides the bulk of the core testing facilities. For more - information, see perldoc for Test::Simple, Test::More, etc. -end - -source_dl = - -build - requires - perl-core - perl-devel - perl(Test::Harness) - end - - build - perl Makefile.PL INSTALLDIRS=perl - make %{PARALLELISMFLAGS} - end - - test - make test - end -end - -packages - package perl-%{name} -end diff --git a/perl-libwww-perl/perl-libwww-perl.nm b/perl-libwww-perl/perl-libwww-perl.nm index f7e5843..4538da5 100644 --- a/perl-libwww-perl/perl-libwww-perl.nm +++ b/perl-libwww-perl/perl-libwww-perl.nm @@ -5,7 +5,7 @@
name = perl-libwww-perl version = 5.837 -release = 1 +release = 2 epoch = 1 arch = noarch thisapp = libwww-perl-%{version} @@ -28,31 +28,37 @@ build perl-core perl-devel perl-HTML-Parser - perl-libwww-perl perl(Test::More) perl(Compress::Zlib) perl(MIME::Base64) perl(Net::FTP) + perl(URI) end
- # Filter string for very weird dependencies. - export PKG_REQUIRES_FILTER = (HTTP::Headers|HTTP::GHTTP|Win32|Authen::NTLM) - build perl Makefile.PL INSTALLDIRS=perl --aliases < /dev/null make %{PARALLELISMFLAGS} end
- test - # Use system wide MIME types (link also to blib/... for "make test"). Doing - # this stuff before "make install" would not cause the symlink to be packaged - # but a copy of /etc/mime.types. - ln -svf /etc/mime.types %{DIR_APP}/blib/lib/LWP/media.types - - make test - end + #test + # # Use system wide MIME types (link also to blib/... for "make test"). Doing + # # this stuff before "make install" would not cause the symlink to be packaged + # # but a copy of /etc/mime.types. + # ln -svf /etc/mime.types %{DIR_APP}/blib/lib/LWP/media.types + # + # make test + #end end
packages package %{name} + # Filter string for very weird dependencies. + filter_requires + HTTP::Headers + HTTP::GHTTP + Win32 + Authen::NTLM + end + end + end diff --git a/perl/perl.nm b/perl/perl.nm index 5389fcd..e555dc1 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -4,9 +4,11 @@ ###############################################################################
name = perl -version = 5.12.3 -release = 4 +version = 5.14.1 +# Never reset release in this package, just increase. +release = 7
+maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Languages url = http://www.perl.org/ license = GPL+ or Artistic and GPLv2+ or Artistic @@ -24,7 +26,7 @@ description scripts. end
-source_dl = +source_dl = http://www.cpan.org/src/5.0/
build requires @@ -41,9 +43,6 @@ build # So we need to pass it explicitely. CFLAGS += -fstack-protector-all
- # Filter string for very weird dependencies. - export PKG_REQUIRES_FILTER = (DBD::SQLite|DBIx::Simple|perl>=[0-9]:.*|NDBM_File|Your::Module::Here|FCGI|Mac::.*) - prepare_cmds sed -i 's/command /command[ -]/' makedepend.SH end @@ -56,7 +55,6 @@ build
sh ./Configure -des \ -Doptimize="%{CFLAGS}" \ - -Dccdlflags="-Wl,--enable-new-dtags" \ -Dversion=%{version} \ -Dmyhostname=localhost \ -Dperladmin=root@localhost \ @@ -102,9 +100,9 @@ build make %{PARALLELISMFLAGS} end
-# test -# make test -# end + test + make test + end
install_cmds # Remove precreated directories @@ -120,81 +118,99 @@ quality-agent end end
+# This variable contains the constant version string +# of this perl package. +perl_requires := %{name}=%{thisver} + +perl_filter_requires + perl>=[0-9]:.* +end + packages - package %{name} + package perl requires - %{name}-libs=%{thisver} + perl-libs=%{thisver} end
provides - # These provides are needed by the perl pkg itself with auto-generated perl.req - %{name}(VMS::Filespec) - %{name}(VMS::Stdio) - # Compat provides - %{name}(:MODULE_COMPAT_5.12.3) - %{name}(:MODULE_COMPAT_5.12.2) - %{name}(:MODULE_COMPAT_5.12.1) - %{name}(:MODULE_COMPAT_5.12.0) + perl(:MODULE_COMPAT_5.14.2) + perl(:MODULE_COMPAT_5.14.1) + perl(:MODULE_COMPAT_5.14.0) # Threading provides - %{name}(:WITH_ITHREADS) - %{name}(:WITH_THREADS) + perl(:WITH_ITHREADS) + perl(:WITH_THREADS) # Largefile provides - %{name}(:WITH_LARGEFILES) + perl(:WITH_LARGEFILES)
# PerlIO provides - %{name}(:WITH_PERLIO) + perl(:WITH_PERLIO) # File provides - %{name}(abbrev.pl) - %{name}(assert.pl) - %{name}(bigfloat.pl) - %{name}(bigint.pl) - %{name}(bigrat.pl) - %{name}(bytes_heavy.pl) - %{name}(cacheout.pl) - %{name}(complete.pl) - %{name}(ctime.pl) - %{name}(dotsh.pl) - %{name}(dumpvar.pl) - %{name}(exceptions.pl) - %{name}(fastcwd.pl) - %{name}(find.pl) - %{name}(finddepth.pl) - %{name}(flush.pl) - %{name}(ftp.pl) - %{name}(getcwd.pl) - %{name}(getopt.pl) - %{name}(getopts.pl) - %{name}(hostname.pl) - %{name}(importenv.pl) - %{name}look.pl) - %{name}(newgetopt.pl) - %{name}(open2.pl) - %{name}(open3.pl) - %{name}(perl5db.pl) - %{name}(pwd.pl) - %{name}(shellwords.pl) - %{name}(stat.pl) - %{name}(syslog.pl) - %{name}(tainted.pl) - %{name}(termcap.pl) - %{name}(timelocal.pl) - %{name}(utf8_heavy.pl) - %{name}(validate.pl) - %{name}(Carp) - %{name}(Carp::Heavy) - %{name}(Exporter) - %{name}(File::Basename) - %{name}(constant) - %{name}(strict) - %{name}(vars) + perl(abbrev.pl) + perl(assert.pl) + perl(bigfloat.pl) + perl(bigint.pl) + perl(bigrat.pl) + perl(bytes_heavy.pl) + perl(cacheout.pl) + perl(complete.pl) + perl(ctime.pl) + perl(dotsh.pl) + perl(dumpvar.pl) + perl(exceptions.pl) + perl(fastcwd.pl) + perl(find.pl) + perl(finddepth.pl) + perl(flush.pl) + perl(ftp.pl) + perl(getcwd.pl) + perl(getopt.pl) + perl(getopts.pl) + perl(hostname.pl) + perl(importenv.pl) + perllook.pl) + perl(newgetopt.pl) + perl(open2.pl) + perl(open3.pl) + perl(perl5db.pl) + perl(pwd.pl) + perl(shellwords.pl) + perl(stat.pl) + perl(syslog.pl) + perl(tainted.pl) + perl(termcap.pl) + perl(timelocal.pl) + perl(utf8_heavy.pl) + perl(validate.pl) + perl(Exporter) + perl(File::Basename) + perl(constant) + perl(strict) + perl(vars) + + # XXX why? + perl(Mac::InternetConfig) + perl(NDBM_File) + end + + filter_requires + %{perl_filter_requires} + DBIx + InternetConfig + perl(Mac + perl(NDBM_File + perl(VMS + end + + filter_provides + perl(Carp) end end - package %{name}-libs + package perl-libs template LIBS provides @@ -206,7 +222,7 @@ packages end end - package %{name}-devel + package perl-devel template DEVEL files @@ -226,7 +242,7 @@ packages end end - #package %{name}-tests + #package perl-tests # summary = Testsuite to check your Perl installation. # description-perl-tests # This package contains the test suite included with perl %{thisver}. @@ -239,9 +255,9 @@ packages # end #end - package %{name}-Archive-Extract + package perl-Archive-Extract epoch = 0 - version = 0.38 + version = 0.48 arch = noarch summary = Generic archive extracting mechanism. @@ -250,7 +266,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end files @@ -259,9 +275,9 @@ packages end end - package %{name}-Archive-Tar + package perl-Archive-Tar epoch = 0 - version = 1.54 + version = 1.76 arch = noarch summary = A module for Perl manipulation of .tar files. @@ -274,22 +290,48 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end files /usr/bin/ptar /usr/bin/ptardiff + /usr/bin/ptargrep /usr/share/perl5/Archive/Tar.pm /usr/share/man/man1/ptar.1* /usr/share/man/man1/ptardiff.1* + /usr/share/man/man1/ptargrep.1* /usr/share/man/man3/Archive::Tar* end end + + package perl-Class-ISA + epoch = 0 + version = 0.36 + arch = noarch + + summary = Report the search path for a class's ISA tree + description + Suppose you have a class (like Food::Fish::Fishstick) that is derived, via + its @ISA, from one or more superclasses (as Food::Fish::Fishstick is from + Food::Fish, Life::Fungus, and Chemicals), and some of those superclasses + may themselves each be derived, via its @ISA, from one or more superclasses + (as above). + end + + requires + %{perl_requires} + end + + files + /usr/share/perl5/Class/ISA.pm + /usr/share/man/man3/Class::ISA.3* + end + end - package %{name}-Compress-Raw-Zlib + package perl-Compress-Raw-Zlib epoch = 0 - version = 2.024 + version = 2.033
summary = Low-Level Interface to the zlib compression library. description @@ -298,7 +340,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end files @@ -306,10 +348,47 @@ packages /usr/share/man/man3/Compress::Raw::Zlib* end end + + package perl-CGI + epoch = 0 + version = 3.49 + arch = noarch + + summary = Handle Common Gateway Interface requests and responses + description + CGI.pm is a stable, complete and mature solution for processing and preparing + HTTP requests and responses. Major features including processing form + submissions, file uploads, reading and writing cookies, query string generation + and manipulation, and processing and preparing HTTP headers. Some HTML + generation utilities are included as well. + + CGI.pm performs very well in in a vanilla CGI.pm environment and also comes + with built-in support for mod_perl and mod_perl2 as well as FastCGI. + end + + requires + %{perl_requires} + end + + provides + perl(CGI)=%{version} + end + + filter_requires + perl(FCGI) + end + + files + /usr/share/perl5/CGI + /usr/share/perl5/CGI.pm + /usr/share/man/man3/CGI.3* + /usr/share/man/man3/CGI::*.3* + end + end - package %{name}-CPAN + package perl-CPAN epoch = 0 - version = 1.9402 + version = 1.9600.01 arch = noarch summary = Query, download and build perl modules from CPAN sites. @@ -318,7 +397,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} perl(Digest::SHA) end @@ -326,6 +405,10 @@ packages cpan cpan=$(version-perl-CPAN) end + + filter_requires + perl(Mac::BuildTools) + end files /usr/bin/cpan @@ -335,9 +418,62 @@ packages end end
- package %{name}-CPANPLUS + package perl-CPAN-Meta + epoch = 0 + version = 2.110440 + arch = noarch + + summary = Distribution metadata for a CPAN dist. + description + Software distributions released to the CPAN include a META.json or, for + older distributions, META.yml, which describes the distribution, its + contents, and the requirements for building and installing the + distribution. The data structure stored in the META.json file is described + in CPAN::Meta::Spec. + end + + requires + %{perl_requires} + end + + files + /usr/share/perl5/CPAN/Meta.pm + /usr/share/perl5/CPAN/Meta + /usr/share/perl5/CPAN/Meta/Converter.pm + /usr/share/perl5/CPAN/Meta/Feature.pm + /usr/share/perl5/CPAN/Meta/History.pm + /usr/share/perl5/CPAN/Meta/Prereqs.pm + /usr/share/perl5/CPAN/Meta/Spec.pm + /usr/share/perl5/CPAN/Meta/Validator.pm + /usr/share/man/man5/CPAN::Meta.* + end + end + + package perl-CPAN-Meta-YAML + epoch = 0 + version = 0.0003 + arch = noarch + + summary = Read and write a subset of YAML for CPAN Meta files. + description + This module implements a subset of the YAML specification for use in reading + and writing CPAN metadata files like META.yml and MYMETA.yml. It should not be + used for any other general YAML parsing or generation task. + end + + requires + %{perl_requires} + end + + files + /usr/share/perl5/CPAN/Meta/YAML.pm + /usr/share/man/man5/CPAN::Meta::YAML* + end + end + + package perl-CPANPLUS epoch = 0 - version = 0.9 + version = 0.9103 arch = noarch summary = API & CLI access to the CPAN mirrors. @@ -347,15 +483,21 @@ packages end requires - %{name}=%{thisver} - %{name}(Digest::SHA) - %{name}(Module::Pluggable)>=2.4 - %{name}(Module::CoreList) - %{name}(DBIx::Simple) + %{perl_requires} + perl(Digest::SHA) + perl(Module::Pluggable)>=2.4 + perl(Module::CoreList) end provides - %{name}-CPANPLUS-Dist-Build=0.06 + perl-CPANPLUS-Dist-Build=0.06 + end + + filter_requires + %{perl_filter_requires} + DBIx + Your::Module::Here + perl(DBD::SQLite) end files @@ -368,10 +510,94 @@ packages /usr/share/man/man3/CPANPLUS* end end + + package perl-Carp + epoch = 0 + version = 1.20 + arch = noarch + + summary = Alternative warn and die for modules. + description + The Carp routines are useful in your own modules because they act like + die() or warn(), but with a message which is more likely to be useful to a + user of your module. In the case of cluck, confess, and longmess that + context is a summary of every call in the call-stack. For a shorter message + you can use carp or croak which report the error as being from where your + module was called. There is no guarantee that that is where the error was, + but it is a good educated guess. + end + + requires + %{perl_requires} + end + + # Do not export unversioned module + filter_provides = ^perl(Carp)\s*$ + + files + /usr/share/perl5/Carp* + /usr/share/man3/Carp* + end + end + + package perl-Digest + epoch = 0 + version = 1.16 + arch = noarch + + summary = Modules that calculate message digests. + description + The Digest:: modules calculate digests, also called "fingerprints" or + "hashes", of some data, called a message. The digest is (usually) + some small/fixed size string. The actual size of the digest depend of + the algorithm used. The message is simply a sequence of arbitrary + bytes or bits. + end + + requires + %{perl_requires} + perl(MIME::Base64) + end + + files + /usr/lib/perl5/Digest + !/usr/lib/perl5/Digest/* + /usr/share/perl5/Digest.pm + /usr/share/perl5/Digest/base.pm + /usr/share/perl5/Digest/file.pm + /usr/share/man/man5/Digest.3* + /usr/share/man/man5/Digest::base.3* + /usr/share/man/man5/Digest::file.3* + end + end + + package perl-Digest-MD5 + epoch = 0 + version = 2.51 + + summary = Perl Interface to the MD5 Algorithm. + description + The Digest::MD5 module allows you to use the RSA Data Security Inc. MD5 + Message Digest algorithm from within Perl programs. The algorithm takes as + input a message of arbitrary length and produces as output a 128-bit + "fingerprint" or "message digest" of the input. + end + + requires + %{perl_requires} + perl(Digest::base)>=1.00 + end + + files + /usr/lib/perl5/Digest/MD5.pm + /usr/lib/perl5/auto/Digest/MD5 + /usr/share/man/man3/Digest::MD5.3* + end + end - package %{name}-Digest-SHA + package perl-Digest-SHA epoch = 0 - version = 5.47 + version = 5.61 summary = Perl extension for SHA-1/224/256/384/512. description @@ -382,20 +608,22 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} + perl(Digest::base) + perl(MIME::Base64) end files /usr/bin/shasum - /usr/share/perl5/Digest* + /usr/share/perl5/Digest/SHA* /usr/share/man/man1/shasum.1* /usr/share/man/man3/Digest::SHA.3* end end - - package %{name}-ExtUtils-CBuilder + + package perl-ExtUtils-CBuilder epoch = 0 - version = 0.27 + version = 0.280203 arch = noarch
summary = Compile and link C code for Perl modules. @@ -405,53 +633,53 @@ packages motivated by the Module::Build project, but may be useful for other purposes as well. end - + requires - %{name}=%{thisver} - %{name}-devel + %{perl_requires} + perl-devel end - + files /usr/share/perl5/ExtUtils/CBuilder* /usr/share/man/man3/ExtUtils::CBuilder* end end - - package %{name}-ExtUtils-Embed + + package perl-ExtUtils-Embed epoch = 0 - version = 1.28 + version = 1.30 arch = noarch - + summary = Utilities for embedding Perl in C/C++ applications. description Utilities for embedding Perl in C/C++ applications. end - + requires - %{name}=%{thisver} - %{name}-devel + %{perl_requires} + perl-devel end - + files /usr/share/perl5/ExtUtils/Embed* /usr/share/man/man3/ExtUtils::Embed* end end - - package %{name}-ExtUtils-MakeMaker + + package perl-ExtUtils-MakeMaker epoch = 0 - version = 6.56 + version = 6.57_05 arch = noarch - + summary = Create a module Makefile. description Create a module Makefile. end - + requires - %{name}=%{thisver} - %{name}-devel - %{name}(Test::Harness) + %{perl_requires} + perl-devel + perl(Test::Harness) end
files @@ -486,10 +714,10 @@ packages /usr/share/man/man3/ExtUtils::testlib.3* end end - - package %{name}-ExtUtils-ParseXS + + package perl-ExtUtils-ParseXS epoch = 0 - version = 2.21 + version = 2.2210 arch = noarch
summary = Module and a script for converting Perl XS code into C code. @@ -498,61 +726,87 @@ packages constructs necessary to let C functions manipulate Perl values and creates the glue necessary to let Perl access those functions. end - + requires - %{name}=%{thisver} - %{name}-devel + %{perl_requires} + perl-devel end - + files /usr/share/perl5/ExtUtils/ParseXS.pm /usr/share/perl5/ExtUtils/xsubpp /usr/share/man/man3/ExtUtils::ParseXS.3* end end - - package %{name}-File-Fetch - epoch = 0 - version = 6.56 + + package perl-File-Fetch + epoch = 1 + version = 0.32 arch = noarch
summary = Generic file fetching mechanism. description File::Fetch is a generic file fetching mechanism. end - + requires - %{name}=%{thisver} - %{name}(IPC::Cmd)>=0.36 - %{name}(Module::Load::Conditional)>=0.04 - %{name}(Params::Check)>=0.07 + %{perl_requires} + perl(IPC::Cmd)>=0.36 + perl(Module::Load::Conditional)>=0.04 + perl(Params::Check)>=0.07 end - + files /usr/share/perl5/File/Fetch.pm /usr/share/man/man3/File::Fetch.3* end end - - package %{name}-IO-Compress + + package perl-HTTP-Tiny epoch = 0 - version = 2.026 - + version = 0.012 + arch = noarch + + summary = A small, simple, correct HTTP/1.1 client. + description + This is a very simple HTTP/1.1 client, designed primarily for doing simple GET + requests without the overhead of a large framework like LWP::UserAgent. + It is more correct and more complete than HTTP::Lite. It supports proxies + (currently only non-authenticating ones) and redirection. It also correctly + resumes after EINTR. + end + + requires + %{perl_requires} + perl(Carp) + perl(IO::Socket) + end + + files + /usr/share/perl5/HTTP/Tiny.pm + /usr/share/man/man5/HTTP::Tiny* + end + end + + package perl-IO-Compress + epoch = 0 + version = 2.033 + summary = IO::Compress wrapper for modules. description This module is the base class for all IO::Compress and IO::Uncompress modules. This module is not intended for direct use in application code. Its sole purpose is to to be sub-classed by IO::Compress modules. end - + requires - %{name}=%{thisver} + %{perl_requires} end - + provides - %{name}(IO::Uncompress::Bunzip2) + perl(IO::Uncompress::Bunzip2) end - + files /usr/share/perl5/Compress/Zlib.pm /usr/lib/perl5/auto/Compress/Zlib/ @@ -568,8 +822,8 @@ packages /usr/share/man/man3/IO::Uncompress::Base.* end end - - package %{name}-IO-Zlib + + package perl-IO-Zlib epoch = 0 version = 1.10 arch = noarch @@ -581,40 +835,67 @@ packages the same way as an IO::File object so you can have common code that doesn't know which sort of file it is using. end - + requires - %{name}=%{thisver} - %{name}(Compress::Zlib) + %{perl_requires} + perl(Compress::Zlib) end - + files /usr/share/perl5/IO/Zlib.pm /usr/share/man/man3/IO::Zlib.* end end - - package %{name}-IPC-Cmd + + package perl-IPC-Cmd epoch = 0 - version = 0.54 + version = 0.70 arch = noarch - + summary = Finding and running system commands made easy. description IPC::Cmd allows you to run commands, interactively if desired, in a platform independent way, but have them still work. end - + requires - %{name}=%{thisver} + %{perl_requires} + perl(ExtUtils::MakeMaker) end - + files /usr/share/perl5/IPC/Cmd.pm /usr/share/man/man3/IPC::Cmd.3* end end + + package perl-JSON-PP + epoch = 0 + version = 2.27150 + arch = noarch + + summary = JSON::XS compatible pure-Perl module. + description + JSON::XS is the fastest and most proper JSON module on CPAN. It is written by + Marc Lehmann in C, so must be compiled and installed in the used environment. + JSON::PP is a pure-Perl module and is compatible with JSON::XS. + end + + requires + %{perl_requires} + end + + files + /usr/bin/json_pp + /usr/share/perl5/JSON/PP + /usr/share/perl5/JSON/PP.pm + /usr/share/man/man1/json_pp.1* + /usr/share/man/man3/JSON::PP.3* + /usr/share/man/man3/JSON::PP::Boolean.3pm* + end + end - package %{name}-Locale-Maketext-Simple + package perl-Locale-Maketext-Simple epoch = 0 version = 0.21 arch = noarch @@ -627,7 +908,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -636,9 +917,9 @@ packages end end - package %{name}-Log-Message + package perl-Log-Message epoch = 0 - version = 0.02 + version = 0.04 arch = noarch summary = Generic message storage mechanism. @@ -652,11 +933,11 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end provides - %{name}(Log::Message::Handlers)=%{version} + perl(Log::Message::Handlers)=%{version} end
files @@ -671,9 +952,9 @@ packages end end - package %{name}-Log-Message-Simple + package perl-Log-Message-Simple epoch = 0 - version = 0.06 + version = 0.08 arch = noarch summary = Simplified frontend to Log::Message. @@ -683,7 +964,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -692,9 +973,9 @@ packages end end - package %{name}-Module-Build + package perl-Module-Build epoch = 0 - version = 0.3603 + version = 0.3800 arch = noarch summary = Perl module for building and installing Perl modules. @@ -711,10 +992,11 @@ packages end requires - %{name}=%{thisver} - %{name}(Archive::Tar)>=1.08 - %{name}(ExtUtils::CBuilder)>=0.15 - %{name}(ExtUtils::ParseXS)>=1.02 + %{perl_requires} + perl(Archive::Tar)>=1.08 + perl(CPAN::Meta)>=2.110420 + perl(ExtUtils::CBuilder)>=0.15 + perl(ExtUtils::ParseXS)>=1.02 end files @@ -727,9 +1009,9 @@ packages end end - package %{name}-Module-CoreList + package perl-Module-CoreList epoch = 0 - version = 2.29 + version = 2.49_01 arch = noarch summary = Perl core modules indexed by perl versions. @@ -740,7 +1022,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -751,9 +1033,9 @@ packages end end - package %{name}-Module-Load + package perl-Module-Load epoch = 0 - version = 0.16 + version = 0.18 arch = noarch summary = Runtime require of both modules and files. @@ -763,7 +1045,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -772,9 +1054,9 @@ packages end end - package %{name}-Module-Load-Conditional + package perl-Module-Load-Conditional epoch = 0 - version = 0.34 + version = 0.44 arch = noarch summary = Looking up module information / loading at runtime. @@ -784,7 +1066,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -793,7 +1075,7 @@ packages end end - package %{name}-Module-Loaded + package perl-Module-Loaded epoch = 0 version = 0.06 arch = noarch @@ -808,7 +1090,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -816,8 +1098,28 @@ packages /usr/share/man/man3/Module::Loaded* end end - - package %{name}-Module-Plugable + + package perl-Module-Metadata + epoch = 0 + version = 1.000004 + arch = noarch + + summary = Gather package and POD information from perl module files. + description + Gather package and POD information from perl module files. + end + + requires + %{perl_requires} + end + + files + /usr/share/perl5/Module/Metadata.pm + /usr/share/man/man3/Module::Metadata.3pm* + end + end + + package perl-Module-Plugable epoch = 0 version = 3.90 arch = noarch @@ -829,7 +1131,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end files @@ -841,9 +1143,9 @@ packages end end
- package %{name}-Object-Accessor + package perl-Object-Accessor epoch = 0 - version = 0.36 + version = 0.38 arch = noarch summary = Perl module that allows per object accessors. @@ -853,7 +1155,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end files @@ -862,7 +1164,7 @@ packages end end - package %{name}-Package-Constants + package perl-Package-Constants epoch = 0 version = 0.02 arch = noarch @@ -875,7 +1177,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -884,9 +1186,9 @@ packages end end - package %{name}-Params-Check + package perl-Params-Check epoch = 0 - version = 0.26 + version = 0.28 arch = noarch summary = Generic input parsing/checking mechanism. @@ -895,11 +1197,11 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end
provides - %{name}(Params::Check) + perl(Params::Check) end files @@ -908,9 +1210,9 @@ packages end end - package %{name}-Parse-CPAN-Meta + package perl-Parse-CPAN-Meta epoch = 0 - version = 1.40 + version = 1.4401 arch = noarch
summary = Parse META.yml and other similar CPAN metadata files. @@ -920,7 +1222,7 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -929,9 +1231,9 @@ packages end end - package %{name}-Path-Tools + package perl-Path-Tools epoch = 0 - version = 3.31 + version = 3.33 license = (GPL+ or Artistic) and BSD summary = PathTools Perl module (Cwd, File::Spec). @@ -940,7 +1242,11 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} + end + + filter_requires + perl(VMS::Filespec) end files @@ -950,8 +1256,34 @@ packages /usr/share/man/man3/File::Spec* end end + + package perl-Perl-OSType + epoch = 0 + version = 1.002 + arch = noarch + + summary = Map perl operating system names to generic types. + description + Modules that provide OS-specific behaviors often need to know if the current + operating system matches a more generic type of operating systems. For example, + 'linux' is a type of 'Unix' operating system and so is 'freebsd'. + This module provides a mapping between an operating system name as given by $^O + and a more generic type. The initial version is based on the OS type mappings + provided in Module::Build and ExtUtils::CBuilder (thus, Microsoft operating + systems are given the type 'Windows' rather than 'Win32'). + end + + requires + %{perl_requires} + end + + files + /usr/share/perl5/Perl/OSType.pm + /usr/share/man/man3/Perl::OSType.3pm* + end + end - package %{name}-Pod-Escapes + package perl-Pod-Escapes epoch= 0 version = 1.04 arch = noarch @@ -963,7 +1295,11 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} + end + + filter_requires + %{perl_filter_requires} end files @@ -972,9 +1308,9 @@ packages end end - package %{name}-Pod-Simple + package perl-Pod-Simple epoch = 0 - version = 3.13 + version = 3.16 arch = noarch summary = Framework for parsing POD documentation. @@ -985,7 +1321,11 @@ packages end requires - %{name}=%{thisver} + %{perl_requires} + end + + filter_requires + %{perl_filter_requires} end files @@ -995,10 +1335,35 @@ packages /usr/share/man/man3/Pod::Simple* end end + + package perl-Scalar-List-Utils + epoch = 0 + version = 1.22 + + summary = A selection of general-utility scalar and list subroutines. + description + Scalar::Util and List::Util contain a selection of subroutines that people have + expressed would be nice to have in the perl core, but the usage would not + really be high enough to warrant the use of a keyword, and the size so small + such that being individual extensions would be wasteful. + end + + requires + %{perl_requires} + end + + files + /usr/lib/perl5/List + /usr/lib/perl5/Scalar + /usr/lib/perl5/auto/List + /usr/share/man/man3/List::Util* + /usr/share/man/man3/Scalar::Util* + end + end - package %{name}-Term-UI + package perl-Term-UI epoch = 0 - version = 0.20 + version = 0.26 arch = noarch
summary = Term::ReadLine UI made easy. @@ -1009,8 +1374,8 @@ packages end
requires - %{name}=%{thisver} - %{name}(Log::Message::Simple) + %{perl_requires} + perl(Log::Message::Simple) end
files @@ -1020,9 +1385,9 @@ packages end end
- package %{name}-Test-Harness + package perl-Test-Harness epoch = 0 - version = 3.17 + version = 3.23 arch = noarch
summary = Run Perl standard test scripts with statistics. @@ -1032,7 +1397,11 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} + end + + filter_requires + %{perl_filter_requires} end
files @@ -1047,9 +1416,9 @@ packages end end
- package %{name}-Test-Simple + package perl-Test-Simple epoch = 0 - version = 0.94 + version = 0.98 arch = noarch
summary = Basic utilities for writing tests. @@ -1058,7 +1427,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1073,9 +1442,9 @@ packages end end
- package %{name}-Time-Piece + package perl-Time-Piece epoch = 0 - version = 1.15 + version = 1.20_01
summary = Time objects from localtime and gmtime. description @@ -1086,7 +1455,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1098,9 +1467,31 @@ packages end end
- package %{name}-parent + package perl-Version-Requirements + epoch = 0 + version = 0.101020 + arch = noarch + + summary = Set of version requirements for a CPAN dist. + description + A Version::Requirements object models a set of version constraints like + those specified in the META.yml or META.json files in CPAN distributions. + It can be built up by adding more and more constraints, and it will reduce + them to the simplest representation. + end + + requires + %{perl_requires} + end + + # No files. + files + end + end + + package perl-parent epoch = 0 - version = 0.223 + version = 0.225 arch = noarch
summary = Establish an ISA relationship with base classes at compile time. @@ -1110,7 +1501,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1119,9 +1510,9 @@ packages end end
- package %{name}-threads + package perl-threads epoch = 0 - version = 1.75 + version = 1.83
summary = Perl interpreter-based threads. description @@ -1135,7 +1526,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1145,9 +1536,9 @@ packages end end
- package %{name}-threads-shared + package perl-threads-shared epoch = 0 - version = 1.32 + version = 1.37
summary = Perl extension for sharing data structures between threads. description @@ -1160,7 +1551,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1170,9 +1561,9 @@ packages end end
- package %{name}-version + package perl-version epoch = 0 - version = 0.82 + version = 0.88 arch = noarch
summary = Perl extension for Version Objects. @@ -1181,7 +1572,7 @@ packages end
requires - %{name}=%{thisver} + %{perl_requires} end
files @@ -1193,7 +1584,7 @@ packages end end
- package %{name}-core + package perl-core epoch = 0
summary = Base perl metapackage. @@ -1203,46 +1594,58 @@ packages end
requires - %{name}=%{thisver} - %{name}-libs - %{name}-devel - %{name}-Archive-Extract - %{name}-Archive-Tar - %{name}-Compress-Raw-Zlib - %{name}-CPAN - %{name}-CPANPLUS - %{name}-Digest-SHA - %{name}-ExtUtils-CBuilder - %{name}-ExtUtils-Embed - %{name}-ExtUtils-MakeMaker - %{name}-ExtUtils-ParseXS - %{name}-File-Fetch - %{name}-IO-Compress - %{name}-IO-Zlib - %{name}-IPC-Cmd - %{name}-Locale-Maketext-Simple - %{name}-Log-Message - %{name}-Log-Message-Simple - %{name}-Module-Build - %{name}-Module-CoreList - %{name}-Module-Load - %{name}-Module-Load-Conditional - %{name}-Module-Loaded - %{name}-Module-Plugable - %{name}-Object-Accessor - %{name}-Package-Constants - %{name}-Params-Check - %{name}-Parse-CPAN-Meta - %{name}-Path-Tools - %{name}-Pod-Simple - %{name}-Term-UI - %{name}-Test-Harness - %{name}-Test-Simple - %{name}-Time-Piece - %{name}-parent - %{name}-threads - %{name}-threads-shared - %{name}-version + %{perl_requires} + perl-libs + perl-devel + perl-Archive-Extract + perl-Archive-Tar + perl-Class-ISA + perl-Compress-Raw-Zlib + perl-CGI + perl-CPAN + perl-CPAN-Meta + perl-CPAN-Meta-YAML + perl-CPANPLUS + perl-Carp + perl-Digest + perl-Digest-MD5 + perl-Digest-SHA + perl-ExtUtils-CBuilder + perl-ExtUtils-Embed + perl-ExtUtils-MakeMaker + perl-ExtUtils-ParseXS + perl-File-Fetch + perl-HTTP-Tiny + perl-IO-Compress + perl-IO-Zlib + perl-IPC-Cmd + perl-JSON-PP + perl-Locale-Maketext-Simple + perl-Log-Message + perl-Log-Message-Simple + perl-Module-Build + perl-Module-CoreList + perl-Module-Load + perl-Module-Load-Conditional + perl-Module-Loaded + perl-Module-Metadata + perl-Module-Plugable + perl-Object-Accessor + perl-Package-Constants + perl-Params-Check + perl-Parse-CPAN-Meta + perl-Perl-OSType + perl-Path-Tools + perl-Pod-Simple + perl-Scalar-List-Utils + perl-Term-UI + perl-Test-Harness + perl-Test-Simple + perl-Time-Piece + perl-parent + perl-threads + perl-threads-shared + perl-version end
# Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry. diff --git a/python-gudev/python-gudev.nm b/python-gudev/python-gudev.nm index 5c0459b..18de1c2 100644 --- a/python-gudev/python-gudev.nm +++ b/python-gudev/python-gudev.nm @@ -5,10 +5,10 @@
name = python-gudev version = 147.1 -release = 1 +release = 2
groups = Development/Tools -url = http://flex.sourceforge.net/ +url = http://www.kernel.org/pub/linux/utils/kernel/hotplug/gudev/ license = LGPLv3+ summary = Python (PyGObject) bindings to the GUDev library.
@@ -32,7 +32,7 @@ build
DIR_APP = %{DIR_SRC}/nzjrs-python-gudev-5fac65a
- CFLAGS += -I$(wildcard /usr/include/pygtk*) + CFLAGS += -I/usr/include/pygtk-2.0
prepare_cmds ./autogen.sh diff --git a/python/python.nm b/python/python.nm index dd4ea61..295f6dc 100644 --- a/python/python.nm +++ b/python/python.nm @@ -5,7 +5,7 @@
name = python version = 2.7.1 -release = 3 +release = 4 thisapp = Python-%{version}
groups = Development/Languages @@ -44,7 +44,6 @@ build end
export CFLAGS += -D_GNU_SOURCE -fwrapv - export CPPFLAGS = $(shell pkg-config --cflags-only-I libffi)
prepare_cmds sed -e "s/#*shared*/*shared*/g" -i Modules/Setup.dist @@ -59,6 +58,8 @@ build end
build + export CPPFLAGS=$(pkg-config --cflags-only-I libffi) + OPT="%{CFLAGS}" \ ./configure \ --prefix=/usr \ @@ -78,12 +79,11 @@ end
packages package %{name} - end - + package %{name}-devel template DEVEL - files =+ \ + files += \ !/usr/lib/python*/config/Makefile \ !/usr/include/python*/pyconfig.h end diff --git a/shadow-utils/shadow-utils.nm b/shadow-utils/shadow-utils.nm index b8f0a14..2106e5d 100644 --- a/shadow-utils/shadow-utils.nm +++ b/shadow-utils/shadow-utils.nm @@ -5,7 +5,7 @@
name = shadow-utils version = 4.1.4.3 -release = 2 +release = 3 thisapp = shadow-%{version}
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -65,10 +65,10 @@ end
packages package %{name} - obsoletes += shadow + obsoletes += shadow<%{thisver} + provides += shadow=%{thisver}
conflicts - shadow pam<1.1.0-4 end end diff --git a/squid/squid.nm b/squid/squid.nm index 20d542d..9bb3e6c 100644 --- a/squid/squid.nm +++ b/squid/squid.nm @@ -4,9 +4,9 @@ ###############################################################################
name = squid -version = 3.1.12 major_ver = 3.1 -release = 1 +version = %{major_ver}.12 +release = 2
maintainer = Christian Schmidt christian.schmidt@ipfire.org groups = Networking/Daemons @@ -38,7 +38,7 @@ build /usr/bin/smbclient end
- export PKG_REQUIRES_FILTER = perl(Authen::Smb) + CFLAGS += -Wno-error
configure_options += \ --datadir=/usr/lib/squid \ @@ -101,5 +101,7 @@ end packages package %{name} requires = /usr/bin/smbclient + + filter_requires = perl(Authen::Smb) end end diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm index d403c9b..8794233 100644 --- a/util-linux/util-linux.nm +++ b/util-linux/util-linux.nm @@ -6,7 +6,7 @@ name = util-linux version = 2.19 major_ver = 2.19 -release = 3 +release = 4
groups = System/Base url = http://kernel.org/~kzak/util-linux/ @@ -84,8 +84,6 @@ build mkdir -pv %{BUILDROOT}/etc ln -svf /proc/mounts %{BUILDROOT}/etc/mtab end - - export PKG_REQUIRES_FILTER = /proc/.*/mounts end
# This symlink is allowed to be absolute. @@ -103,6 +101,8 @@ packages /etc/pam.d/system-auth end
+ filter_requires = /proc/.*/mounts + obsoletes = util-linux-ng
conflicts
hooks/post-receive -- IPFire 3.x development tree