[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 953073459e1ab036c21336e7a62b28fc16458bec

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3597 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 2.x development tree".

The branch, next has been updated
       via  953073459e1ab036c21336e7a62b28fc16458bec (commit)
       via  8ec568b07744b61fc911c0749240f8b09641ea7d (commit)
       via  16d026cbcb41e9231fe6bbc0ac350bba12f625ca (commit)
       via  9f5e031e6dd614bee09678dbaa5bbc795d13674c (commit)
      from  dd0411c64607ca0f56adc352f4c2c26ca48b1215 (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 953073459e1ab036c21336e7a62b28fc16458bec
Merge: 8ec568b dd0411c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jun 20 15:40:28 2012 +0200

    Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 8ec568b07744b61fc911c0749240f8b09641ea7d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jun 20 11:57:44 2012 +0200

    Add logwatch changes to next core update.

commit 16d026cbcb41e9231fe6bbc0ac350bba12f625ca
Merge: df106d8 9f5e031
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Jun 20 11:54:00 2012 +0200

    Merge remote-tracking branch 'jlentfer/logwatch' into next

commit 9f5e031e6dd614bee09678dbaa5bbc795d13674c
Author: Jan Lentfer <Jan.Lentfer(a)web.de>
Date:   Wed Jun 20 10:42:35 2012 +0200

    logwatch: Enable Date::Manip 6.x support (using interface v5)

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/61/filelists/logwatch  |    1 +
 lfs/logwatch                                 |    1 +
 src/patches/logwatch-7.3.6-date_manip6.patch |   13 +++++++++++++
 3 files changed, 15 insertions(+), 0 deletions(-)
 create mode 120000 config/rootfiles/core/61/filelists/logwatch
 create mode 100644 src/patches/logwatch-7.3.6-date_manip6.patch

Difference in files:
diff --git a/config/rootfiles/core/61/filelists/logwatch b/config/rootfiles/core/61/filelists/logwatch
new file mode 120000
index 0000000..f14eabd
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/logwatch
@@ -0,0 +1 @@
+../../../common/logwatch
\ No newline at end of file
diff --git a/lfs/logwatch b/lfs/logwatch
index ac2585b..755557a 100644
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && sed -e "s/^TEMPDIR=.*/TEMPDIR=\"\/tmp\"/g" -i install_logwatch.sh
+	cd $(DIR_APP)/lib && patch < $(DIR_SRC)/src/patches/logwatch-7.3.6-date_manip6.patch
 	@cd $(DIR_APP) && chmod 755 install_logwatch.sh
 	cd $(DIR_APP) && yes "" | ./install_logwatch.sh
 	
diff --git a/src/patches/logwatch-7.3.6-date_manip6.patch b/src/patches/logwatch-7.3.6-date_manip6.patch
new file mode 100644
index 0000000..015e7d6
--- /dev/null
+++ b/src/patches/logwatch-7.3.6-date_manip6.patch
@@ -0,0 +1,13 @@
+--- Logwatch.pm.orig    2012-06-20 09:58:12.786294471 +0200
++++ Logwatch.pm 2012-06-20 09:41:59.443055298 +0200
+@@ -4,6 +4,10 @@
+
+ package Logwatch;
+
++# Define interace version 5 for Date::Manip
++BEGIN {
++       $Date::Manip::Backend = 'DM5';
++}
+ use strict;
+ use Exporter;
+ use POSIX qw(strftime);


hooks/post-receive
--
IPFire 2.x development tree