From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. cce37f04afc89e327a9945d08bf447d5188d30a4 Date: Tue, 09 Sep 2014 20:37:12 +0200 Message-ID: <20140909183712.6251B21262@argus.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7657221063397582463==" List-Id: --===============7657221063397582463== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 2.x development tree". The branch, master has been updated via cce37f04afc89e327a9945d08bf447d5188d30a4 (commit) via 7b0afb50d3c5a65249f4866ba3eb52d50be4de30 (commit) via d18925c39a586328ffddf4bb92a13f29190aa29a (commit) via 38ffd2d6410fa26707b21a6870b89e45d745f666 (commit) via d2ff1cc455f37bb806e10e27b31f0fe31b3de16e (commit) via d49a04c939bcb5ebadba3138dd52c2852700806b (commit) from 51d8e3309363d9e576030024da74639261e14961 (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 cce37f04afc89e327a9945d08bf447d5188d30a4 Author: Arne Fitzenreiter Date: Tue Sep 9 19:20:54 2014 +0200 openssl-compat: update to 0.9.8zb. commit 7b0afb50d3c5a65249f4866ba3eb52d50be4de30 Merge: d18925c 51d8e33 Author: Arne Fitzenreiter Date: Tue Sep 9 17:57:27 2014 +0200 Merge remote-tracking branch 'origin/master' into core82 commit d18925c39a586328ffddf4bb92a13f29190aa29a Merge: d2ff1cc 38ffd2d Author: Arne Fitzenreiter Date: Sat Aug 23 17:06:40 2014 +0200 Merge branch 'core82' of ssh://git.ipfire.org/pub/git/ipfire-2.x into cor= e82 commit 38ffd2d6410fa26707b21a6870b89e45d745f666 Author: Arne Fitzenreiter Date: Sat Aug 23 09:36:01 2014 +0200 perl-PDF-API2: rootfile fix for arm. commit d2ff1cc455f37bb806e10e27b31f0fe31b3de16e Author: Arne Fitzenreiter Date: Fri Aug 22 17:03:19 2014 +0200 samba: bump PAK_VER. commit d49a04c939bcb5ebadba3138dd52c2852700806b Author: Arne Fitzenreiter Date: Fri Aug 22 12:05:39 2014 +0200 sane: depends on cups libs. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/77 =3D> core/82}/filelists/openssl-compat | 0 config/rootfiles/packages/perl-PDF-API2 | 6 +++--- lfs/openssl-compat | 6 +++--- lfs/samba | 2 +- lfs/sane | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/77 =3D> core/82}/filelists/openssl-compat (10= 0%) Difference in files: diff --git a/config/rootfiles/core/82/filelists/openssl-compat b/config/rootf= iles/core/82/filelists/openssl-compat new file mode 120000 index 0000000..c9fa421 --- /dev/null +++ b/config/rootfiles/core/82/filelists/openssl-compat @@ -0,0 +1 @@ +../../../common/openssl-compat \ No newline at end of file diff --git a/config/rootfiles/packages/perl-PDF-API2 b/config/rootfiles/packa= ges/perl-PDF-API2 index c594d82..642579a 100644 --- a/config/rootfiles/packages/perl-PDF-API2 +++ b/config/rootfiles/packages/perl-PDF-API2 @@ -129,9 +129,9 @@ usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/uniglyph= .txt usr/lib/perl5/site_perl/5.12.3/PDF/API2/UniWrap.pm usr/lib/perl5/site_perl/5.12.3/PDF/API2/Util.pm usr/lib/perl5/site_perl/5.12.3/PDF/API2/Win32.pm -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2 -#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/PDF/API2/.packl= ist +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2 +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/PDF/API2/.pa= cklist #usr/share/man/man3/PDF::API2.3 #usr/share/man/man3/PDF::API2::Annotation.3 #usr/share/man/man3/PDF::API2::Basic::PDF::Array.3 diff --git a/lfs/openssl-compat b/lfs/openssl-compat index d2ae6a0..604ac13 100644 --- a/lfs/openssl-compat +++ b/lfs/openssl-compat @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2013 IPFire Team = # +# Copyright (C) 2007-2014 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 0.9.8y +VER =3D 0.9.8zb =20 THISAPP =3D openssl-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 47c7fb37f78c970f1d30aa2f9e9e26d8 +$(DL_FILE)_MD5 =3D 65c5f42734f8ecd58990b12a9afa6453 =20 install : $(TARGET) =20 diff --git a/lfs/samba b/lfs/samba index 4bd42cb..3772ad3 100644 --- a/lfs/samba +++ b/lfs/samba @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D samba -PAK_VER =3D 58 +PAK_VER =3D 59 =20 DEPS =3D "cups krb5" =20 diff --git a/lfs/sane b/lfs/sane index 842b548..39b9603 100644 --- a/lfs/sane +++ b/lfs/sane @@ -33,9 +33,9 @@ DIR_APP =3D $(DIR_SRC)/sane-backends-$(VER) TARGET =3D $(DIR_INFO)/$(THISAPP) =20 PROG =3D sane -PAK_VER =3D 3 +PAK_VER =3D 4 =20 -DEPS =3D "libtiff" +DEPS =3D "cups libtiff" =20 ############################################################################= ### # Top-level Rules hooks/post-receive -- IPFire 2.x development tree --===============7657221063397582463==--