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 a0649a3f09e87818ec3ee50078bdd1854e8e8681 (commit) via 89a09abe399ea8cf582f66783c1998dab79d4bdd (commit) via fa4603be1b996748d3c6624863f5a35ea88cb2c6 (commit) via f389fe050bcf34517d4a6af67001812dc61b5593 (commit) via d1fba19ad24b306c8a54516f871a5a269f04f656 (commit) via 30747343882e533c1261fdb363c4755cb1ae8d51 (commit) from e2d6a3754d9432a61317b05fff41387219eadb5e (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 a0649a3f09e87818ec3ee50078bdd1854e8e8681 Merge: 89a09ab f389fe0 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 18 16:23:11 2012 +0100
Merge remote-tracking branch 'stevee/pam'
commit 89a09abe399ea8cf582f66783c1998dab79d4bdd Merge: d1fba19 fa4603b Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jan 18 16:22:16 2012 +0100
Merge remote-tracking branch 'stevee/coreutils'
commit fa4603be1b996748d3c6624863f5a35ea88cb2c6 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jan 13 19:30:25 2012 +0100
coreutils: Update to 8.15.
Fixes #314
commit f389fe050bcf34517d4a6af67001812dc61b5593 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Fri Jan 13 19:20:23 2012 +0100
pam: Update to 1.1.5.
commit d1fba19ad24b306c8a54516f871a5a269f04f656 Merge: e2d6a37 3074734 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Jan 8 19:27:25 2012 +0100
Merge remote-tracking branch 'stevee/perl-WWW-Curl'
commit 30747343882e533c1261fdb363c4755cb1ae8d51 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jan 7 20:56:23 2012 +0100
perl-WWW-Curl: New package.
-----------------------------------------------------------------------
Summary of changes: coreutils/coreutils.nm | 6 +++--- coreutils/patches/coreutils-i18n.patch | 17 +++++++++-------- coreutils/patches/coreutils-selinux.patch | 19 +++---------------- pam/pam.nm | 15 +++++++++------ .../perl-WWW-Curl.nm | 19 ++++++++++--------- 5 files changed, 34 insertions(+), 42 deletions(-) copy perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm => perl-WWW-Curl/perl-WWW-Curl.nm (63%)
Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index abdfcbb..6b65353 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,8 +4,8 @@ ###############################################################################
name = coreutils -version = 8.14 -release = 3 +version = 8.15 +release = 1
groups = System/Base url = http://www.gnu.org/software/coreutils/ @@ -31,7 +31,7 @@ build libcap-devel libselinux-devel ncurses-devel - pam-devel + pam-devel>=1.1.5 end
CFLAGS += \ diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index 9ba6bb4..e2f9f21 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -10,7 +10,7 @@ diff -urNp coreutils-8.13-orig/lib/linebuffer.h coreutils-8.13/lib/linebuffer.h +# include <wchar.h> +# endif + - /* A `struct linebuffer' holds a line of text. */ + /* A 'struct linebuffer' holds a line of text. */
struct linebuffer @@ -28,6 +33,9 @@ struct linebuffer @@ -1784,8 +1784,8 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c static void getoptarg (char *arg, char switch_char, char *character, + int *character_length, int *character_width, int *number); - void usage (int status); static void print_files (int number_of_files, char **av); + static void init_parameters (int number_of_files); @@ -439,7 +491,6 @@ static void store_char (char c); static void pad_down (int lines); static void read_rest_of_line (COLUMN *p); @@ -2271,7 +2271,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c { width = TAB_WIDTH (chars_per_c, input_position);
-@@ -2741,6 +2942,154 @@ char_to_clump (char c) +@@ -2741,6 +2942,155 @@ char_to_clump (char c) return chars; }
@@ -2279,6 +2279,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c +static int +char_to_clump_multi (char c) +{ ++ unsigned char uc = c; + static size_t mbc_pos = 0; + static char mbc[MB_LEN_MAX] = {'\0'}; + static mbstate_t state = {'\0'}; @@ -2365,7 +2366,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c + width += 4; + chars += 4; + *s++ = '\'; -+ sprintf (esc_buff, "%03o", c); ++ sprintf (esc_buff, "%03o", uc); + for (j = 0; j <= 2; ++j) + *s++ = (int) esc_buff[j]; + } @@ -2386,7 +2387,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c + width += 4; + chars += 4; + *s++ = '\'; -+ sprintf (esc_buff, "%03o", c); ++ sprintf (esc_buff, "%03o", uc); + for (j = 0; j <= 2; ++j) + *s++ = (int) esc_buff[j]; + } @@ -2970,9 +2971,9 @@ diff -urNp coreutils-8.13-orig/src/sort.c coreutils-8.13/src/sort.c +} +#endif /* HAV_EMBRTOWC */ + - static int - general_numcompare (char const *sa, char const *sb) - { + /* Work around a problem whereby the long double value returned by glibc's + strtold ("NaN", ...) contains uninitialized bits: clear all bytes of + A and B before calling strtold. FIXME: remove this function once @@ -1942,7 +2305,7 @@ general_numcompare (char const *sa, char Return 0 if the name in S is not recognized. */
diff --git a/coreutils/patches/coreutils-selinux.patch b/coreutils/patches/coreutils-selinux.patch index 7ebce30..3e5c143 100644 --- a/coreutils/patches/coreutils-selinux.patch +++ b/coreutils/patches/coreutils-selinux.patch @@ -45,7 +45,7 @@ diff -urNp coreutils-8.13-orig/src/chcon.c coreutils-8.13/src/chcon.c +Change the SELinux security context of each FILE to CONTEXT.\n\ With --reference, change the security context of each FILE to that of RFILE.\n\ \n\ - -h, --no-dereference affect symbolic links instead of any referenced file\n\ + "), stdout); diff -urNp coreutils-8.13-orig/src/copy.c coreutils-8.13/src/copy.c --- coreutils-8.13-orig/src/copy.c 2011-07-28 12:38:27.000000000 +0200 +++ coreutils-8.13/src/copy.c 2011-09-09 10:30:39.564562214 +0200 @@ -243,10 +243,10 @@ diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c };
/* Display letters and indicators for each filetype. -@@ -283,6 +284,7 @@ static void queue_directory (char const +@@ -282,6 +283,7 @@ + bool command_line_arg); static void sort_files (void); static void parse_ls_color (void); - void usage (int status); +static void print_scontext_format (const struct fileinfo *f);
/* Initial size of hash table. @@ -382,19 +382,6 @@ diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c default: usage (LS_FAILURE); } -@@ -2714,8 +2738,10 @@ clear_files (void) - struct fileinfo *f = sorted_file[i]; - free (f->name); - free (f->linkname); -- if (f->scontext != UNKNOWN_SECURITY_CONTEXT) -- freecon (f->scontext); -+ if (f->scontext != UNKNOWN_SECURITY_CONTEXT) { -+ freecon (f->scontext); -+ f->scontext = NULL; -+ } - } - - cwd_n_used = 0; @@ -2757,6 +2783,7 @@ gobble_file (char const *name, enum file memset (f, '\0', sizeof *f); f->stat.st_ino = inode; diff --git a/pam/pam.nm b/pam/pam.nm index 62a5dd9..4bb01c9 100644 --- a/pam/pam.nm +++ b/pam/pam.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pam -version = 1.1.0 -release = 5 +version = 1.1.5 +release = 1 thisapp = Linux-PAM-%{version}
groups = System/Base @@ -19,12 +19,14 @@ description having to recompile programs that handle authentication. end
-source_dl = -sources = %{thisapp}.tar.bz2 +# This is the old location that might be revived in future +# source_dl = http://ftp.us.kernel.org/pub/linux/libs/pam/library/ + +source_dl = https://fedorahosted.org/releases/l/i/linux-pam/
build requires - #audit-devel + audit-devel bison cracklib-devel flex @@ -35,7 +37,8 @@ build --libdir=/%{lib} \ --includedir=%{includedir}/security \ --docdir=/usr/share/doc/Linux-PAM-%{version} \ - --enable-read-both-confs + --enable-read-both-confs \ + --disable-rpath
install_cmds mkdir -pv %{BUILDROOT}%{libdir} diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm new file mode 100644 index 0000000..9b1cf1a --- /dev/null +++ b/perl-WWW-Curl/perl-WWW-Curl.nm @@ -0,0 +1,47 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = perl-WWW-Curl +version = 4.15 +release = 1 +thisapp = WWW-Curl-%{version} + +groups = Development/Libraries +url = http://search.cpan.org/dist/WWW-Curl +license = GPL+ +summary = Perl extension interface for libcurl. + +description + WWW::Curl is a Perl extension interface for libcurl.. +end + +source_dl = http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/ + +build + requires + perl(ExtUtils::MakeMaker) + perl(ExtUtils::ParseXS) + libcurl-devel + end + + build + perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{CFLAGS}" + make %{PARALLELISMFLAGS} + end + + make_install_targets = pure_install PERL_INSTALL_ROOT=%{BUILDROOT} +end + +packages + package %{name} + requires + perl + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end
hooks/post-receive -- IPFire 3.x development tree