* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7438ebb844dfdba3edd8104973f6665f5d6dffeb
@ 2012-01-21 12:24 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-01-21 12:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 6192 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 7438ebb844dfdba3edd8104973f6665f5d6dffeb (commit)
via 3d694011b286b62d43cdecfc74b8d3117298533d (commit)
via b146f40751993e63b6b74961a64bf3945f542fb4 (commit)
via 777cf2ae29f820eca33f2d7f2f22bc6f09b01338 (commit)
via 4c15615b2e3b78d61f042cca0e240ba66e9b6186 (commit)
from a0649a3f09e87818ec3ee50078bdd1854e8e8681 (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 7438ebb844dfdba3edd8104973f6665f5d6dffeb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 21 13:22:18 2012 +0100
openssl: Update to 1.0.0g.
Bug #10001: This release fixed a DTLS DoS issue which was
recently introduced by the fix for CVE-2011-4109.
commit 3d694011b286b62d43cdecfc74b8d3117298533d
Merge: b146f40 777cf2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 21 12:59:02 2012 +0100
Merge remote-tracking branch 'maniacikarus/iptables'
commit b146f40751993e63b6b74961a64bf3945f542fb4
Merge: a0649a3 4c15615
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jan 21 12:58:55 2012 +0100
Merge remote-tracking branch 'maniacikarus/ccache'
commit 777cf2ae29f820eca33f2d7f2f22bc6f09b01338
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Mon Jan 9 21:42:16 2012 +0000
iptables: Updated to minor 1.4.12.2
Fixes #318
commit 4c15615b2e3b78d61f042cca0e240ba66e9b6186
Author: Christian Schmidt <christian.schmidt(a)ipfire.org>
Date: Mon Jan 9 21:36:05 2012 +0000
ccache: Updated to the latest version 3.1.7
Fixes #322
-----------------------------------------------------------------------
Summary of changes:
ccache/ccache.nm | 4 ++--
iptables/iptables.nm | 4 ++--
openssl/openssl.nm | 4 ++--
...-version.patch => openssl-1.0.0g-version.patch} | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
rename openssl/patches/{openssl-1.0.0f-version.patch => openssl-1.0.0g-version.patch} (57%)
Difference in files:
diff --git a/ccache/ccache.nm b/ccache/ccache.nm
index b30a0d6..9fd27eb 100644
--- a/ccache/ccache.nm
+++ b/ccache/ccache.nm
@@ -4,8 +4,8 @@
###############################################################################
name = ccache
-version = 3.1.6
-release = 3
+version = 3.1.7
+release = 1
groups = Development/Compilers
url = http://ccache.samba.org/
diff --git a/iptables/iptables.nm b/iptables/iptables.nm
index b16942a..ea53b4c 100644
--- a/iptables/iptables.nm
+++ b/iptables/iptables.nm
@@ -4,8 +4,8 @@
###############################################################################
name = iptables
-version = 1.4.12.1
-release = 2
+version = 1.4.12.2
+release = 1
groups = Networking/Tools
url = http://www.netfilter.org/
diff --git a/openssl/openssl.nm b/openssl/openssl.nm
index 4c27b89..f221603 100644
--- a/openssl/openssl.nm
+++ b/openssl/openssl.nm
@@ -4,8 +4,8 @@
###############################################################################
name = openssl
-version = 1.0.0f
-release = 2
+version = 1.0.0g
+release = 1
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Libraries
diff --git a/openssl/patches/openssl-1.0.0f-version.patch b/openssl/patches/openssl-1.0.0f-version.patch
deleted file mode 100644
index 6c67a5e..0000000
--- a/openssl/patches/openssl-1.0.0f-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up openssl-1.0.0f/crypto/opensslv.h.version openssl-1.0.0f/crypto/opensslv.h
---- openssl-1.0.0f/crypto/opensslv.h.version 2012-01-05 13:28:32.000000000 +0100
-+++ openssl-1.0.0f/crypto/opensslv.h 2012-01-05 13:29:37.000000000 +0100
-@@ -25,7 +25,8 @@
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- * major minor fix final patch/beta)
- */
--#define OPENSSL_VERSION_NUMBER 0x1000006fL
-+/* we have to keep the version number to not break the abi */
-+#define OPENSSL_VERSION_NUMBER 0x10000003
- #ifdef OPENSSL_FIPS
- #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0f-fips 4 Jan 2012"
- #else
-@@ -83,7 +84,7 @@
- * should only keep the versions that are binary compatible with the current.
- */
- #define SHLIB_VERSION_HISTORY ""
--#define SHLIB_VERSION_NUMBER "1.0.0"
-+#define SHLIB_VERSION_NUMBER "1.0.0f"
-
-
- #endif /* HEADER_OPENSSLV_H */
diff --git a/openssl/patches/openssl-1.0.0g-version.patch b/openssl/patches/openssl-1.0.0g-version.patch
new file mode 100644
index 0000000..55aa0c0
--- /dev/null
+++ b/openssl/patches/openssl-1.0.0g-version.patch
@@ -0,0 +1,22 @@
+diff -up openssl-1.0.0g/crypto/opensslv.h.version openssl-1.0.0g/crypto/opensslv.h
+--- openssl-1.0.0g/crypto/opensslv.h.version 2012-01-19 14:50:50.094028047 +0100
++++ openssl-1.0.0g/crypto/opensslv.h 2012-01-19 14:51:48.655529671 +0100
+@@ -25,7 +25,8 @@
+ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
+ * major minor fix final patch/beta)
+ */
+-#define OPENSSL_VERSION_NUMBER 0x1000007fL
++/* we have to keep the version number to not break the abi */
++#define OPENSSL_VERSION_NUMBER 0x10000003
+ #ifdef OPENSSL_FIPS
+ #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0g-fips 18 Jan 2012"
+ #else
+@@ -83,7 +84,7 @@
+ * should only keep the versions that are binary compatible with the current.
+ */
+ #define SHLIB_VERSION_HISTORY ""
+-#define SHLIB_VERSION_NUMBER "1.0.0"
++#define SHLIB_VERSION_NUMBER "1.0.0g"
+
+
+ #endif /* HEADER_OPENSSLV_H */
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-21 12:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-21 12:24 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7438ebb844dfdba3edd8104973f6665f5d6dffeb git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox