* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. aa1c6e9fa84c10120491f92254a59d70f8efeaa5
@ 2014-12-02 16:28 git
0 siblings, 0 replies; only message in thread
From: git @ 2014-12-02 16:28 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 33185 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 aa1c6e9fa84c10120491f92254a59d70f8efeaa5 (commit)
via 413abba64a7aa6a9f55533e1b2d31a7a88ee0fba (commit)
via f7f47c4f2f77a1833664c77c43021e3c76339301 (commit)
via d141dc078a366ca1c91de02ce8875be224bb52fd (commit)
via 160645b7c5b784fe79ac81124969b3f1eb8287df (commit)
via 32bda1fb6e7a7571c2567d3b5d575862e2549e3a (commit)
via f184f593e35c12f9f2a4cef2e4922011162cf1f5 (commit)
via d3b375fc1e653ad00e37efb8b5626d10589f4056 (commit)
via 487d0477f7fb7be8c869aa891f15896537822276 (commit)
via 0c61cd9cea3a0124c26463e3e3c52996db285a93 (commit)
via 5d2dc721a1d38de9495b11dc2447bd42ebd35b4d (commit)
via 7294c83b5bb6aa8dd16762d70c8df56115c555b8 (commit)
via 02d860ebdad3b6a0ae2b3673984dab2068862dbe (commit)
via 6ae131ef235c11d9ff7419b9b84be7132bd25fb5 (commit)
via 75afeed1613ab2ac8e76885c29dff1a28c9b0860 (commit)
via ddfc0693e99bbc241f4e054ddcba85f0068596fd (commit)
via 2a2195807eec43527b854a976e0dd23e84d42a56 (commit)
via c814d7b590af354e22559c42b603b4a0b1f56bb5 (commit)
via b92f39bcacc61f912ab2ca19b46bb90e2bbaee08 (commit)
via 068babfb1377c930a80c1b7baf75c97661a2481c (commit)
via 264b8ae7df90adc8b6dd0f43a46ea8b80d8f4e90 (commit)
via 7f88f8f569060f8f06c8dcc3875f4056b33f6dbb (commit)
from f0e77571c033b74e7d8eb2757c73864ce12d06f9 (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 aa1c6e9fa84c10120491f92254a59d70f8efeaa5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:27:05 2014 +0100
Add screen update to Core Update 87
commit 413abba64a7aa6a9f55533e1b2d31a7a88ee0fba
Merge: f7f47c4 2a21958
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:26:36 2014 +0100
Merge remote-tracking branch 'mfischer/screen' into next
commit f7f47c4f2f77a1833664c77c43021e3c76339301
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:25:48 2014 +0100
Add fcron update to Core Update 87
commit d141dc078a366ca1c91de02ce8875be224bb52fd
Merge: 160645b c814d7b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:25:32 2014 +0100
Merge remote-tracking branch 'mfischer/fcron' into next
commit 160645b7c5b784fe79ac81124969b3f1eb8287df
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:24:00 2014 +0100
Add gnupg update to Core Update 87
commit 32bda1fb6e7a7571c2567d3b5d575862e2549e3a
Merge: f184f59 b92f39b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:23:42 2014 +0100
Merge remote-tracking branch 'mfischer/gnupg' into next
commit f184f593e35c12f9f2a4cef2e4922011162cf1f5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:23:06 2014 +0100
Add hdparm update to Core Update 87
commit d3b375fc1e653ad00e37efb8b5626d10589f4056
Merge: 487d047 068babf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:22:01 2014 +0100
Merge remote-tracking branch 'mfischer/hdparm' into next
commit 487d0477f7fb7be8c869aa891f15896537822276
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:20:36 2014 +0100
Add file update to Core Update 87
commit 0c61cd9cea3a0124c26463e3e3c52996db285a93
Merge: 5d2dc72 264b8ae
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:20:20 2014 +0100
Merge remote-tracking branch 'mfischer/file' into next
commit 5d2dc721a1d38de9495b11dc2447bd42ebd35b4d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:18:46 2014 +0100
Add grep update to Core Update 87
commit 7294c83b5bb6aa8dd16762d70c8df56115c555b8
Merge: 02d860e 7f88f8f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:17:39 2014 +0100
Merge remote-tracking branch 'mfischer/grep' into next
commit 02d860ebdad3b6a0ae2b3673984dab2068862dbe
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 17:17:23 2014 +0100
Start Core Update 87
commit 6ae131ef235c11d9ff7419b9b84be7132bd25fb5
Merge: 75afeed ddfc069
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 16:52:17 2014 +0100
Merge remote-tracking branch 'amarx/BUG10693' into next
commit 75afeed1613ab2ac8e76885c29dff1a28c9b0860
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Dec 2 12:28:49 2014 +0100
openvpn: Update to 2.3.6
Fixes CVE-2014-8104
commit ddfc0693e99bbc241f4e054ddcba85f0068596fd
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Tue Dec 2 08:38:51 2014 +0100
Squid-Accounting: Bugfix 10693
Fixes problem with last years month in webinterface and bill creation
commit 2a2195807eec43527b854a976e0dd23e84d42a56
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sun Nov 30 17:09:38 2014 +0100
screen: Update to 4.2.1
commit c814d7b590af354e22559c42b603b4a0b1f56bb5
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sat Nov 29 23:55:57 2014 +0100
fcron: Update to 3.2.0
commit b92f39bcacc61f912ab2ca19b46bb90e2bbaee08
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sat Nov 29 21:40:22 2014 +0100
gnupg: Update to 1.4.18
commit 068babfb1377c930a80c1b7baf75c97661a2481c
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sat Nov 29 21:31:31 2014 +0100
hdparm: Update to 9.45
commit 264b8ae7df90adc8b6dd0f43a46ea8b80d8f4e90
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sat Nov 29 21:19:19 2014 +0100
file: Update to 5.20
commit 7f88f8f569060f8f06c8dcc3875f4056b33f6dbb
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Wed Nov 26 21:05:28 2014 +0100
grep: Update to 2.21
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/fcron | 122 ++++++++++-----------
config/rootfiles/common/screen | 4 +-
.../{oldcore/53 => core/86}/filelists/openvpn | 0
config/rootfiles/core/{85 => 87}/exclude | 0
.../{oldcore/29 => core/87}/filelists/fcron | 0
.../{oldcore/66 => core/87}/filelists/file | 0
.../{oldcore/60 => core/87}/filelists/files | 1 +
.../{oldcore/66 => core/87}/filelists/gnupg | 0
.../{oldcore/66 => core/87}/filelists/grep | 0
.../{oldcore/66 => core/87}/filelists/hdparm | 0
.../{oldcore/66 => core/87}/filelists/screen | 0
config/rootfiles/core/{85 => 87}/meta | 0
config/rootfiles/core/{85 => 87}/update.sh | 4 +-
lfs/fcron | 6 +-
lfs/file | 6 +-
lfs/gnupg | 6 +-
lfs/grep | 4 +-
lfs/hdparm | 6 +-
lfs/openvpn | 4 +-
lfs/screen | 9 +-
lfs/squid-accounting | 2 +-
make.sh | 4 +-
src/patches/screen-4.0.3-stropts.patch | 48 --------
src/patches/screen-4.2.1-altscreen.patch | 16 +++
src/patches/screen-4.2.1-cpation-hardstatus.patch | 16 +++
src/squid-accounting/acct-lib.pl | 7 +-
26 files changed, 129 insertions(+), 136 deletions(-)
copy config/rootfiles/{oldcore/53 => core/86}/filelists/openvpn (100%)
copy config/rootfiles/core/{85 => 87}/exclude (100%)
copy config/rootfiles/{oldcore/29 => core/87}/filelists/fcron (100%)
copy config/rootfiles/{oldcore/66 => core/87}/filelists/file (100%)
copy config/rootfiles/{oldcore/60 => core/87}/filelists/files (63%)
copy config/rootfiles/{oldcore/66 => core/87}/filelists/gnupg (100%)
copy config/rootfiles/{oldcore/66 => core/87}/filelists/grep (100%)
copy config/rootfiles/{oldcore/66 => core/87}/filelists/hdparm (100%)
copy config/rootfiles/{oldcore/66 => core/87}/filelists/screen (100%)
copy config/rootfiles/core/{85 => 87}/meta (100%)
copy config/rootfiles/core/{85 => 87}/update.sh (98%)
delete mode 100644 src/patches/screen-4.0.3-stropts.patch
create mode 100644 src/patches/screen-4.2.1-altscreen.patch
create mode 100644 src/patches/screen-4.2.1-cpation-hardstatus.patch
Difference in files:
diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron
index 89f68a7..d37541b 100644
--- a/config/rootfiles/common/fcron
+++ b/config/rootfiles/common/fcron
@@ -15,67 +15,67 @@ etc/fcron.weekly/info.txt
usr/bin/fcronsighup
usr/bin/fcrontab
usr/sbin/fcron
-#usr/share/doc/fcron-3.0.4
-#usr/share/doc/fcron-3.0.4/en
-#usr/share/doc/fcron-3.0.4/en/HTML
-#usr/share/doc/fcron-3.0.4/en/HTML/LEGALNOTICE.html
-#usr/share/doc/fcron-3.0.4/en/HTML/changes.html
-#usr/share/doc/fcron-3.0.4/en/HTML/faq.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fcron.8.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fcron.conf.5.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fcrondyn.1.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fcrontab.1.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fcrontab.5.html
-#usr/share/doc/fcron-3.0.4/en/HTML/fdl.html
-#usr/share/doc/fcron-3.0.4/en/HTML/gpl.html
-#usr/share/doc/fcron-3.0.4/en/HTML/how-and-why.html
-#usr/share/doc/fcron-3.0.4/en/HTML/index.html
-#usr/share/doc/fcron-3.0.4/en/HTML/install.html
-#usr/share/doc/fcron-3.0.4/en/HTML/manpages.html
-#usr/share/doc/fcron-3.0.4/en/HTML/readme.html
-#usr/share/doc/fcron-3.0.4/en/HTML/relnotes.html
-#usr/share/doc/fcron-3.0.4/en/HTML/thanks.html
-#usr/share/doc/fcron-3.0.4/en/HTML/todo.html
-#usr/share/doc/fcron-3.0.4/en/HTML/using-fcron.html
-#usr/share/doc/fcron-3.0.4/en/txt
-#usr/share/doc/fcron-3.0.4/en/txt/changes.txt
-#usr/share/doc/fcron-3.0.4/en/txt/faq.txt
-#usr/share/doc/fcron-3.0.4/en/txt/gpl.txt
-#usr/share/doc/fcron-3.0.4/en/txt/install.txt
-#usr/share/doc/fcron-3.0.4/en/txt/readme.txt
-#usr/share/doc/fcron-3.0.4/en/txt/relnotes.txt
-#usr/share/doc/fcron-3.0.4/en/txt/thanks.txt
-#usr/share/doc/fcron-3.0.4/en/txt/todo.txt
-#usr/share/doc/fcron-3.0.4/fr
-#usr/share/doc/fcron-3.0.4/fr/HTML
-#usr/share/doc/fcron-3.0.4/fr/HTML/LEGALNOTICE.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/changes.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/faq.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fcron.8.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fcron.conf.5.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fcrondyn.1.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fcrontab.1.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fcrontab.5.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/fdl.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/gpl.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/how-and-why.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/index.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/install.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/manpages.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/readme.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/relnotes.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/thanks.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/todo.html
-#usr/share/doc/fcron-3.0.4/fr/HTML/using-fcron.html
-#usr/share/doc/fcron-3.0.4/fr/txt
-#usr/share/doc/fcron-3.0.4/fr/txt/changes.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/faq.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/gpl.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/install.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/readme.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/relnotes.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/thanks.txt
-#usr/share/doc/fcron-3.0.4/fr/txt/todo.txt
+#usr/share/doc/fcron-3.2.0
+#usr/share/doc/fcron-3.2.0/en
+#usr/share/doc/fcron-3.2.0/en/HTML
+#usr/share/doc/fcron-3.2.0/en/HTML/LEGALNOTICE.html
+#usr/share/doc/fcron-3.2.0/en/HTML/changes.html
+#usr/share/doc/fcron-3.2.0/en/HTML/faq.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fcron.8.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fcron.conf.5.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fcrondyn.1.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fcrontab.1.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fcrontab.5.html
+#usr/share/doc/fcron-3.2.0/en/HTML/fdl.html
+#usr/share/doc/fcron-3.2.0/en/HTML/gpl.html
+#usr/share/doc/fcron-3.2.0/en/HTML/how-and-why.html
+#usr/share/doc/fcron-3.2.0/en/HTML/index.html
+#usr/share/doc/fcron-3.2.0/en/HTML/install.html
+#usr/share/doc/fcron-3.2.0/en/HTML/manpages.html
+#usr/share/doc/fcron-3.2.0/en/HTML/readme.html
+#usr/share/doc/fcron-3.2.0/en/HTML/relnotes.html
+#usr/share/doc/fcron-3.2.0/en/HTML/thanks.html
+#usr/share/doc/fcron-3.2.0/en/HTML/todo.html
+#usr/share/doc/fcron-3.2.0/en/HTML/using-fcron.html
+#usr/share/doc/fcron-3.2.0/en/txt
+#usr/share/doc/fcron-3.2.0/en/txt/changes.txt
+#usr/share/doc/fcron-3.2.0/en/txt/faq.txt
+#usr/share/doc/fcron-3.2.0/en/txt/gpl.txt
+#usr/share/doc/fcron-3.2.0/en/txt/install.txt
+#usr/share/doc/fcron-3.2.0/en/txt/readme.txt
+#usr/share/doc/fcron-3.2.0/en/txt/relnotes.txt
+#usr/share/doc/fcron-3.2.0/en/txt/thanks.txt
+#usr/share/doc/fcron-3.2.0/en/txt/todo.txt
+#usr/share/doc/fcron-3.2.0/fr
+#usr/share/doc/fcron-3.2.0/fr/HTML
+#usr/share/doc/fcron-3.2.0/fr/HTML/LEGALNOTICE.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/changes.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/faq.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fcron.8.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fcron.conf.5.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fcrondyn.1.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fcrontab.1.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fcrontab.5.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/fdl.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/gpl.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/how-and-why.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/index.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/install.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/manpages.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/readme.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/relnotes.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/thanks.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/todo.html
+#usr/share/doc/fcron-3.2.0/fr/HTML/using-fcron.html
+#usr/share/doc/fcron-3.2.0/fr/txt
+#usr/share/doc/fcron-3.2.0/fr/txt/changes.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/faq.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/gpl.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/install.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/readme.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/relnotes.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/thanks.txt
+#usr/share/doc/fcron-3.2.0/fr/txt/todo.txt
#usr/share/man/fr
#usr/share/man/fr/man1
#usr/share/man/fr/man1/fcrondyn.1
diff --git a/config/rootfiles/common/screen b/config/rootfiles/common/screen
index f57e550..6124db1 100644
--- a/config/rootfiles/common/screen
+++ b/config/rootfiles/common/screen
@@ -1,6 +1,6 @@
etc/screenrc
usr/bin/screen
-usr/bin/screen-4.0.3
+usr/bin/screen-4.2.1
#usr/info/screen.info
#usr/info/screen.info-1
#usr/info/screen.info-2
@@ -8,6 +8,8 @@ usr/bin/screen-4.0.3
#usr/info/screen.info-4
#usr/info/screen.info-5
#usr/man/man1/screen.1
+#usr/share/info/screen.info
+#usr/share/man/man1/screen.1
#usr/share/screen
#usr/share/screen/utf8encodings
#usr/share/screen/utf8encodings/01
diff --git a/config/rootfiles/core/86/filelists/openvpn b/config/rootfiles/core/86/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/86/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/87/exclude b/config/rootfiles/core/87/exclude
new file mode 100644
index 0000000..18e9b4d
--- /dev/null
+++ b/config/rootfiles/core/87/exclude
@@ -0,0 +1,20 @@
+boot/config.txt
+etc/collectd.custom
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/87/filelists/fcron b/config/rootfiles/core/87/filelists/fcron
new file mode 120000
index 0000000..4a454ea
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/fcron
@@ -0,0 +1 @@
+../../../common/fcron
\ No newline at end of file
diff --git a/config/rootfiles/core/87/filelists/file b/config/rootfiles/core/87/filelists/file
new file mode 120000
index 0000000..0c60e43
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/file
@@ -0,0 +1 @@
+../../../common/file
\ No newline at end of file
diff --git a/config/rootfiles/core/87/filelists/files b/config/rootfiles/core/87/filelists/files
new file mode 100644
index 0000000..168c7d1
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/files
@@ -0,0 +1,3 @@
+etc/system-release
+etc/issue
+var/ipfire/langs
diff --git a/config/rootfiles/core/87/filelists/gnupg b/config/rootfiles/core/87/filelists/gnupg
new file mode 120000
index 0000000..a1a1564
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/gnupg
@@ -0,0 +1 @@
+../../../common/gnupg
\ No newline at end of file
diff --git a/config/rootfiles/core/87/filelists/grep b/config/rootfiles/core/87/filelists/grep
new file mode 120000
index 0000000..ab5ef8b
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/core/87/filelists/hdparm b/config/rootfiles/core/87/filelists/hdparm
new file mode 120000
index 0000000..b644751
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/hdparm
@@ -0,0 +1 @@
+../../../common/hdparm
\ No newline at end of file
diff --git a/config/rootfiles/core/87/filelists/screen b/config/rootfiles/core/87/filelists/screen
new file mode 120000
index 0000000..81008f4
--- /dev/null
+++ b/config/rootfiles/core/87/filelists/screen
@@ -0,0 +1 @@
+../../../common/screen
\ No newline at end of file
diff --git a/config/rootfiles/core/87/meta b/config/rootfiles/core/87/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/87/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/87/update.sh b/config/rootfiles/core/87/update.sh
new file mode 100644
index 0000000..ad06686
--- /dev/null
+++ b/config/rootfiles/core/87/update.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2014 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=87
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Remove old files
+
+# Extract files
+extract_files
+
+# Start services
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
diff --git a/lfs/fcron b/lfs/fcron
index d8fe8fb..5cc2cd6 100644
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# 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 @@
include Config
-VER = 3.0.4
+VER = 3.2.0
THISAPP = fcron-$(VER)
DL_FILE = $(THISAPP).src.tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5a26a1dfd91fdc7e87401e98aef870e6
+$(DL_FILE)_MD5 = 4b031c2fba32a98fa814d1557158b0e9
install : $(TARGET)
diff --git a/lfs/file b/lfs/file
index 70a38e2..bfd7552 100644
--- a/lfs/file
+++ b/lfs/file
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# 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 @@
include Config
-VER = 5.11
+VER = 5.20
THISAPP = file-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 16a407bd66d6c7a832f3a5c0d609c27b
+$(DL_FILE)_MD5 = 5d5e13eb3e0e13839da869a31790faf2
install : $(TARGET)
diff --git a/lfs/gnupg b/lfs/gnupg
index 5e5ead9..29835e0 100644
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# 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 @@
include Config
-VER = 1.4.12
+VER = 1.4.18
THISAPP = gnupg-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ce3742e5c7912559cab7894ad8ba7f6b
+$(DL_FILE)_MD5 = 54db1be9588b11afbbdd8b82d4ea883a
install : $(TARGET)
diff --git a/lfs/grep b/lfs/grep
index e9b0b18..ac20161 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -24,7 +24,7 @@
include Config
-VER = 2.14
+VER = 2.21
THISAPP = grep-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d4a3f03849d1e17ce56ab76aa5a24cab
+$(DL_FILE)_MD5 = 43c48064d6409862b8a850db83c8038a
install : $(TARGET)
diff --git a/lfs/hdparm b/lfs/hdparm
index e4a44bf..e4e2e53 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> #
# #
# 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 @@
include Config
-VER = 9.42
+VER = 9.45
THISAPP = hdparm-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0af5a38b212fe08f5afbe5e37f34b40b
+$(DL_FILE)_MD5 = 1c75d0751a44928b6c4bc81fb16d7fe8
install : $(TARGET)
diff --git a/lfs/openvpn b/lfs/openvpn
index 8c7c81a..44a8b46 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -24,7 +24,7 @@
include Config
-VER = 2.3.4
+VER = 2.3.6
THISAPP = openvpn-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9b70be9fb45e407117c3c9b118e4ba22
+$(DL_FILE)_MD5 = bcc30c296566df14feebdd8aa0e408ca
install : $(TARGET)
diff --git a/lfs/screen b/lfs/screen
index b94d62e..f3c451d 100644
--- a/lfs/screen
+++ b/lfs/screen
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
# #
# 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 @@
include Config
-VER = 4.0.3
+VER = 4.2.1
THISAPP = screen-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8506fd205028a96c741e4037de6e3c42
+$(DL_FILE)_MD5 = 419a0594e2b25039239af8b90eda7d92
install : $(TARGET)
@@ -70,7 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.0.3-stropts.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.2.1-cpation-hardstatus.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/screen-4.2.1-altscreen.patch
cd $(DIR_APP) && ./configure --prefix=/usr --with-socket-dir=/var/run/screen --with-sys-screenrc=/etc/screenrc
cd $(DIR_APP) && sed -i -e "s%/usr/local/etc/screenrc%/etc/screenrc%" {etc,doc}/*
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 0dca63f..184c922 100644
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -9,7 +9,7 @@
include Config
-VER = 1.0.1
+VER = 1.0.2
THISAPP = squid-accounting-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
diff --git a/make.sh b/make.sh
index 4007591..766499f 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.17" # Version number
-CORE="86" # Core Level (Filename)
-PAKFIRE_CORE="85" # Core Level (PAKFIRE)
+CORE="87" # Core Level (Filename)
+PAKFIRE_CORE="86" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
diff --git a/src/patches/screen-4.0.3-stropts.patch b/src/patches/screen-4.0.3-stropts.patch
deleted file mode 100644
index d6cbed7..0000000
--- a/src/patches/screen-4.0.3-stropts.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -up screen-4.0.3/tty.sh.stropts screen-4.0.3/tty.sh
---- screen-4.0.3/tty.sh.stropts 2003-09-08 16:24:25.000000000 +0200
-+++ screen-4.0.3/tty.sh 2008-04-07 11:28:34.000000000 +0200
-@@ -76,7 +76,7 @@ exit 0
- #endif
-
- #include "config.h"
--#ifdef SVR4
-+#if 0
- #include <sys/stropts.h> /* for I_POP */
- #endif
-
-diff -up screen-4.0.3/screen.c.stropts screen-4.0.3/screen.c
---- screen-4.0.3/screen.c.stropts 2008-04-07 11:25:21.000000000 +0200
-+++ screen-4.0.3/screen.c 2008-04-07 11:29:14.000000000 +0200
-@@ -50,7 +50,7 @@
-
- #include "config.h"
-
--#ifdef SVR4
-+#if 0
- # include <sys/stropts.h>
- #endif
-
-diff -up screen-4.0.3/process.c.stropts screen-4.0.3/process.c
---- screen-4.0.3/process.c.stropts 2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.3/process.c 2008-04-07 11:29:47.000000000 +0200
-@@ -37,7 +37,7 @@
- #include "config.h"
-
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
--#ifdef SVR4
-+#if 0
- # include <sys/stropts.h>
- #endif
-
-diff -up screen-4.0.3/pty.c.stropts screen-4.0.3/pty.c
---- screen-4.0.3/pty.c.stropts 2003-09-08 16:26:18.000000000 +0200
-+++ screen-4.0.3/pty.c 2008-04-07 11:30:07.000000000 +0200
-@@ -34,7 +34,7 @@
- #endif
-
- /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
-+#if 0
- # include <sys/stropts.h>
- #endif
-
diff --git a/src/patches/screen-4.2.1-altscreen.patch b/src/patches/screen-4.2.1-altscreen.patch
new file mode 100644
index 0000000..0a35166
--- /dev/null
+++ b/src/patches/screen-4.2.1-altscreen.patch
@@ -0,0 +1,16 @@
+diff --git a/src/ansi.c b/src/ansi.c
+index e76eef4..bbdc119 100644
+--- a/ansi.c
++++ b/ansi.c
+@@ -1444,8 +1444,8 @@ int c, intermediate;
+ else
+ {
+ if (curr->w_alt.on) {
+- LeaveAltScreen(curr);
+- RestoreCursor(&curr->w_alt.cursor);
++ RestoreCursor(&curr->w_alt.cursor);
++ LeaveAltScreen(curr);
+ }
+ }
+ if (a1 == 47 && !i)
+
diff --git a/src/patches/screen-4.2.1-cpation-hardstatus.patch b/src/patches/screen-4.2.1-cpation-hardstatus.patch
new file mode 100644
index 0000000..c6809af
--- /dev/null
+++ b/src/patches/screen-4.2.1-cpation-hardstatus.patch
@@ -0,0 +1,16 @@
+diff --git a/src/screen.c b/src/screen.c
+index 473e4fa..8b36bea 100644
+--- a/screen.c
++++ b/screen.c
+@@ -2271,8 +2271,8 @@ int padlen;
+ while (i-- > 0)
+ *pn-- = ' ';
+ numpad--;
+- if (r && p - buf == winmsg_rendpos[r - 1])
+- winmsg_rendpos[--r] = pn - buf;
++ if (r && p - buf + 1== winmsg_rendpos[r - 1])
++ winmsg_rendpos[--r] = pn - buf + 1;
+ }
+ }
+ return pn2;
+
diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index a19140d..826be26 100644
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -337,7 +337,12 @@ sub getmonth{
my $monat=$_[0]-1 if($_[0]);
my $tag=1;
my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
- my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
+ my $time2=0;
+ if (($monat+1) == 12){
+ $time2=timelocal(0,0,0,$tag,0,$jahr+1);
+ }else{
+ $time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
+ }
--$time2;
return ($time1,$time2);
}
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-02 16:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-12-02 16:28 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. aa1c6e9fa84c10120491f92254a59d70f8efeaa5 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox