IPFire-SCM December 2013

ipfire-scm@lists.ipfire.org

1 participants
56 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a408e02da29d32d72a570112caec8544f0474f51
by git＠ipfire.org 03 Dec '13

03 Dec '13

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 a408e02da29d32d72a570112caec8544f0474f51 (commit) from 6003c4bbdb46094dcbcf63939395fe3bda82da70 (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 a408e02da29d32d72a570112caec8544f0474f51 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Dec 3 14:42:30 2013 +0100 squid: Update to 3.3.11. ----------------------------------------------------------------------- Summary of changes: lfs/squid | 10 +- src/patches/squid-3.1-10486.patch | 54 -------- src/patches/squid-3.1-10487.patch | 73 ---------- .../squid-3.3.10-optional-ssl-options.patch | 148 --------------------- src/patches/squid-3.3.10-set-rlimit-fds.patch | 51 ------- 5 files changed, 2 insertions(+), 334 deletions(-) delete mode 100644 src/patches/squid-3.1-10486.patch delete mode 100644 src/patches/squid-3.1-10487.patch delete mode 100644 src/patches/squid-3.3.10-optional-ssl-options.patch delete mode 100644 src/patches/squid-3.3.10-set-rlimit-fds.patch Difference in files: diff --git a/lfs/squid b/lfs/squid index d3bff48..3c5f6c5 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.3.10 +VER = 3.3.11 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 28058812d722cac303517a643e28bcb0 +$(DL_FILE)_MD5 = dd016ff5f14b2548083b3882207914f6 install : $(TARGET) @@ -53,7 +53,6 @@ md5 : $(subst %,%_MD5,$(objects)) ############################################################################### # Downloading, checking, md5sum ############################################################################### - $(patsubst %,$(DIR_CHK)/%,$(objects)) : @$(CHECK) @@ -70,11 +69,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-optional-ssl-options.patch - cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-set-rlimit-fds.patch - - cd $(DIR_APP) && ./bootstrap.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/squid \ diff --git a/src/patches/squid-3.1-10486.patch b/src/patches/squid-3.1-10486.patch deleted file mode 100644 index 6a0388e..0000000 --- a/src/patches/squid-3.1-10486.patch +++ /dev/null @@ -1,54 +0,0 @@ ------------------------------------------------------------- -revno: 10486 -revision-id: squid3(a)treenet.co.nz-20130222111325-zizr296kq3te4g7h -parent: squid3(a)treenet.co.nz-20130109021503-hqg7ufldrudpzr9l -fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3790 -author: Reinhard Sojka <reinhard.sojka(a)parlament.gv.at> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: SQUID_3_1 -timestamp: Fri 2013-02-22 04:13:25 -0700 -message: - Bug 3790: cachemgr.cgi crash with authentication ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20130222111325-zizr296kq3te4g7h -# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1 -# testament_sha1: 121adf68a9c3b2eca766cfb768256b6b57d9816b -# timestamp: 2013-02-22 11:17:18 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1 -# base_revision_id: squid3(a)treenet.co.nz-20130109021503-\ -# hqg7ufldrudpzr9l -# -# Begin patch -=== modified file 'tools/cachemgr.cc' ---- tools/cachemgr.cc 2013-01-08 23:11:51 +0000 -+++ tools/cachemgr.cc 2013-02-22 11:13:25 +0000 -@@ -1162,7 +1162,6 @@ - { - static char buf[1024]; - size_t stringLength = 0; -- const char *str64; - - if (!req->passwd) - return ""; -@@ -1171,15 +1170,12 @@ - req->user_name ? req->user_name : "", - req->passwd); - -- str64 = base64_encode(buf); -- -- stringLength += snprintf(buf, sizeof(buf), "Authorization: Basic %s\r\n", str64); -+ stringLength += snprintf(buf, sizeof(buf), "Authorization: Basic %s\r\n", base64_encode(buf)); - - assert(stringLength < sizeof(buf)); - -- snprintf(&buf[stringLength], sizeof(buf) - stringLength, "Proxy-Authorization: Basic %s\r\n", str64); -+ snprintf(&buf[stringLength], sizeof(buf) - stringLength, "Proxy-Authorization: Basic %s\r\n", base64_encode(buf)); - -- xxfree(str64); - return buf; - } - - diff --git a/src/patches/squid-3.1-10487.patch b/src/patches/squid-3.1-10487.patch deleted file mode 100644 index 2ca4848..0000000 --- a/src/patches/squid-3.1-10487.patch +++ /dev/null @@ -1,73 +0,0 @@ ------------------------------------------------------------- -revno: 10487 -revision-id: squid3(a)treenet.co.nz-20130710124748-2n6111r04xsi71vx -parent: squid3(a)treenet.co.nz-20130222111325-zizr296kq3te4g7h -author: Nathan Hoad <nathan(a)getoffmalawn.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: SQUID_3_1 -timestamp: Wed 2013-07-10 06:47:48 -0600 -message: - Protect against buffer overrun in DNS query generation - - see SQUID-2013:2. - - This bug has been present as long as the internal DNS component however - most code reaching this point is passing through URL validation first. - With Squid-3.2 Host header verification using DNS directly we may have - problems. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20130710124748-2n6111r04xsi71vx -# target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1 -# testament_sha1: b5be85c8876ce15ec8fa173845e61755b6942fe0 -# timestamp: 2013-07-10 12:48:57 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ -# /SQUID_3_1 -# base_revision_id: squid3(a)treenet.co.nz-20130222111325-\ -# zizr296kq3te4g7h -# -# Begin patch -=== modified file 'src/dns_internal.cc' ---- src/dns_internal.cc 2011-10-11 02:12:56 +0000 -+++ src/dns_internal.cc 2013-07-10 12:47:48 +0000 -@@ -1532,22 +1532,26 @@ - void - idnsALookup(const char *name, IDNSCB * callback, void *data) - { -- unsigned int i; -+ size_t nameLength = strlen(name); -+ -+ // Prevent buffer overflow on q->name -+ if (nameLength > NS_MAXDNAME) { -+ debugs(23, DBG_IMPORTANT, "SECURITY ALERT: DNS name too long to perform lookup: '" << name << "'. see access.log for details."); -+ callback(data, NULL, 0, "Internal error"); -+ return; -+ } -+ -+ if (idnsCachedLookup(name, callback, data)) -+ return; -+ -+ idns_query *q = cbdataAlloc(idns_query); -+ q->id = idnsQueryID(); - int nd = 0; -- idns_query *q; -- -- if (idnsCachedLookup(name, callback, data)) -- return; -- -- q = cbdataAlloc(idns_query); -- -- q->id = idnsQueryID(); -- -- for (i = 0; i < strlen(name); i++) -+ for (unsigned int i = 0; i < nameLength; ++i) - if (name[i] == '.') - nd++; - -- if (Config.onoff.res_defnames && npc > 0 && name[strlen(name)-1] != '.') { -+ if (Config.onoff.res_defnames && npc > 0 && name[nameLength-1] != '.') { - q->do_searchpath = 1; - } else { - q->do_searchpath = 0; - diff --git a/src/patches/squid-3.3.10-optional-ssl-options.patch b/src/patches/squid-3.3.10-optional-ssl-options.patch deleted file mode 100644 index f6a108c..0000000 --- a/src/patches/squid-3.3.10-optional-ssl-options.patch +++ /dev/null @@ -1,148 +0,0 @@ -From: http://bazaar.launchpad.net/~squid/squid/3-trunk/revision/13115 - -Committer: Christos Tsantilas -Date: 2013-11-07 10:46:14 UTC -Revision ID: chtsanti(a)users.sourceforge.net-20131107104614-s3a9kzlkgm7x9rhf - -http://bugs.squid-cache.org/show_bug.cgi?id=3936 -Bug 3936: error-details.txt parse error - -Squid fails parsing error-details.txt template when one or more listed OpenSSL -errors are not supported on running platform. -This patch add a hardcoded list of OpenSSL errors wich can be optional. - -This is a Measurement Factory project - -=== modified file 'src/ssl/ErrorDetail.cc' ---- src/ssl/ErrorDetail.cc 2013-07-31 00:13:04 +0000 -+++ src/ssl/ErrorDetail.cc 2013-11-07 10:46:14 +0000 -@@ -221,6 +221,31 @@ - {SSL_ERROR_NONE, NULL} - }; - -+static const char *OptionalSslErrors[] = { -+ "X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER", -+ "X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION", -+ "X509_V_ERR_KEYUSAGE_NO_CRL_SIGN", -+ "X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION", -+ "X509_V_ERR_INVALID_NON_CA", -+ "X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED", -+ "X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE", -+ "X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED", -+ "X509_V_ERR_INVALID_EXTENSION", -+ "X509_V_ERR_INVALID_POLICY_EXTENSION", -+ "X509_V_ERR_NO_EXPLICIT_POLICY", -+ "X509_V_ERR_DIFFERENT_CRL_SCOPE", -+ "X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE", -+ "X509_V_ERR_UNNESTED_RESOURCE", -+ "X509_V_ERR_PERMITTED_VIOLATION", -+ "X509_V_ERR_EXCLUDED_VIOLATION", -+ "X509_V_ERR_SUBTREE_MINMAX", -+ "X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE", -+ "X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX", -+ "X509_V_ERR_UNSUPPORTED_NAME_SYNTAX", -+ "X509_V_ERR_CRL_PATH_VALIDATION_ERROR", -+ NULL -+}; -+ - struct SslErrorAlias { - const char *name; - const Ssl::ssl_error_t *errors; -@@ -331,6 +356,16 @@ - return NULL; - } - -+bool -+Ssl::ErrorIsOptional(const char *name) -+{ -+ for (int i = 0; OptionalSslErrors[i] != NULL; ++i) { -+ if (strcmp(name, OptionalSslErrors[i]) == 0) -+ return true; -+ } -+ return false; -+} -+ - const char * - Ssl::GetErrorDescr(Ssl::ssl_error_t value) - { - -=== modified file 'src/ssl/ErrorDetail.h' ---- src/ssl/ErrorDetail.h 2013-05-30 10:10:29 +0000 -+++ src/ssl/ErrorDetail.h 2013-11-07 10:46:14 +0000 -@@ -40,6 +40,14 @@ - - /** - \ingroup ServerProtocolSSLAPI -+ * Return true if the SSL error is optional and may not supported -+ * by current squid version -+ */ -+ -+bool ErrorIsOptional(const char *name); -+ -+/** -+ \ingroup ServerProtocolSSLAPI - * Used to pass SSL error details to the error pages returned to the - * end user. - */ - -=== modified file 'src/ssl/ErrorDetailManager.cc' ---- src/ssl/ErrorDetailManager.cc 2013-10-25 00:13:46 +0000 -+++ src/ssl/ErrorDetailManager.cc 2013-11-07 10:46:14 +0000 -@@ -218,32 +218,35 @@ - } - - Ssl::ssl_error_t ssl_error = Ssl::GetErrorCode(errorName.termedBuf()); -- if (ssl_error == SSL_ERROR_NONE) { -+ if (ssl_error != SSL_ERROR_NONE) { -+ -+ if (theDetails->getErrorDetail(ssl_error)) { -+ debugs(83, DBG_IMPORTANT, HERE << -+ "WARNING! duplicate entry: " << errorName); -+ return false; -+ } -+ -+ ErrorDetailEntry &entry = theDetails->theList[ssl_error]; -+ entry.error_no = ssl_error; -+ entry.name = errorName; -+ String tmp = parser.getByName("detail"); -+ httpHeaderParseQuotedString(tmp.termedBuf(), tmp.size(), &entry.detail); -+ tmp = parser.getByName("descr"); -+ httpHeaderParseQuotedString(tmp.termedBuf(), tmp.size(), &entry.descr); -+ bool parseOK = entry.descr.defined() && entry.detail.defined(); -+ -+ if (!parseOK) { -+ debugs(83, DBG_IMPORTANT, HERE << -+ "WARNING! missing important field for detail error: " << errorName); -+ return false; -+ } -+ -+ } else if (!Ssl::ErrorIsOptional(errorName.termedBuf())) { - debugs(83, DBG_IMPORTANT, HERE << - "WARNING! invalid error detail name: " << errorName); - return false; - } - -- if (theDetails->getErrorDetail(ssl_error)) { -- debugs(83, DBG_IMPORTANT, HERE << -- "WARNING! duplicate entry: " << errorName); -- return false; -- } -- -- ErrorDetailEntry &entry = theDetails->theList[ssl_error]; -- entry.error_no = ssl_error; -- entry.name = errorName; -- String tmp = parser.getByName("detail"); -- httpHeaderParseQuotedString(tmp.termedBuf(), tmp.size(), &entry.detail); -- tmp = parser.getByName("descr"); -- httpHeaderParseQuotedString(tmp.termedBuf(), tmp.size(), &entry.descr); -- bool parseOK = entry.descr.defined() && entry.detail.defined(); -- -- if (!parseOK) { -- debugs(83, DBG_IMPORTANT, HERE << -- "WARNING! missing imporant field for detail error: " << errorName); -- return false; -- } - }// else {only spaces and black lines; just ignore} - - buf.consume(size); - diff --git a/src/patches/squid-3.3.10-set-rlimit-fds.patch b/src/patches/squid-3.3.10-set-rlimit-fds.patch deleted file mode 100644 index a80ce73..0000000 --- a/src/patches/squid-3.3.10-set-rlimit-fds.patch +++ /dev/null @@ -1,51 +0,0 @@ -http://bazaar.launchpad.net/~squid/squid/3-trunk/revision/13144 - - Committer: Amos Jeffries - Date: 2013-11-23 01:28:52 UTC - Revision ID: squid3(a)treenet.co.nz-20131123012852-zpe8hamjrs5vy42w - -http://bugs.squid-cache.org/show_bug.cgi?id=3970 -Bug 3970: max_filedescriptors disabled due to missing setrlimit - -=== modified file 'configure.ac' ---- configure.ac 2013-11-16 13:19:28 +0000 -+++ configure.ac 2013-11-23 01:28:52 +0000 -@@ -2534,7 +2534,6 @@ - ;; - esac - -- - dnl --with-maxfd present for compatibility with Squid-2. - dnl undocumented in ./configure --help to encourage using the Squid-3 directive - AC_ARG_WITH(maxfd,, -@@ -2542,6 +2541,7 @@ - case ${withval} in - [[0-9]]*) - squid_filedescriptors_num=$withval -+ AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)]) - ;; - *) - AC_MSG_ERROR(--with-maxfd expects a numeric argument) -@@ -2556,6 +2556,7 @@ - case ${withval} in - [[0-9]]*) - squid_filedescriptors_num=$withval -+ AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)]) - ;; - *) - AC_MSG_ERROR(--with-filedescriptors expects a numeric argument) -@@ -2564,10 +2565,9 @@ - ]) - - SQUID_CHECK_DEFAULT_FD_SETSIZE --if test "x$squid_filedescriptors_num" = "x"; then -- SQUID_CHECK_MAXFD --else -- AC_MSG_NOTICE([forcing use of $squid_filedescriptors_num filedescriptors (user-forced)]) -+SQUID_CHECK_MAXFD -+if test "x$squid_filedescriptors_num" != "x"; then -+ AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num]) - fi - if test "$squid_filedescriptors_num" -lt 512 ; then - AC_MSG_WARN([$squid_filedescriptors_num may not be enough filedescriptors if your]) - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6003c4bbdb46094dcbcf63939395fe3bda82da70
by git＠ipfire.org 03 Dec '13

03 Dec '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ea955c544fa5ff4939449bc163426fc36e1482f
by git＠ipfire.org 02 Dec '13

02 Dec '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f9e43dcdd2517cdd56810a243270e3697844569
by git＠ipfire.org 02 Dec '13

02 Dec '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bdbfbac6b473908dcf93cf96bce8dc762c87d3fc
by git＠ipfire.org 02 Dec '13

02 Dec '13

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 bdbfbac6b473908dcf93cf96bce8dc762c87d3fc (commit) via 57c8392d1c42e8794ac193a88923d0823103861d (commit) via c0a4b928399ca37112dda7de1e55ae93642889dc (commit) via ec4a4fafb28f4eaadf122e03754c9d601ec7f881 (commit) via b1c17c7a95e0a108a9ddcf022ec34f30dec1689b (commit) via fce512dce39a56dc1e099b1c73544f87beedcacf (commit) from 532b997c65fba44c2c5778fd7622fafe513cc245 (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 bdbfbac6b473908dcf93cf96bce8dc762c87d3fc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:55:58 2013 +0100 core74: Add strongswan update. commit 57c8392d1c42e8794ac193a88923d0823103861d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:48:58 2013 +0100 core74: Add dnsforward.cgi to ISO. Bug #10447. commit c0a4b928399ca37112dda7de1e55ae93642889dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:45:20 2013 +0100 core74: Add updated proxy.cgi. Reflects the FD changes. commit ec4a4fafb28f4eaadf122e03754c9d601ec7f881 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:44:28 2013 +0100 core74: Add openvpn. This package has been updated before. commit b1c17c7a95e0a108a9ddcf022ec34f30dec1689b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:43:58 2013 +0100 core74: Add squid. Covers the filedescriptors issues. commit fce512dce39a56dc1e099b1c73544f87beedcacf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Dec 2 20:41:25 2013 +0100 Create Core Update 74. Will automatically increase the transparent proxy port if it is set to 81. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 1 + config/rootfiles/core/{70 => 74}/exclude | 0 config/rootfiles/core/74/filelists/files | 5 +++++ .../{72 => 74}/filelists/i586/strongswan-padlock | 0 .../{oldcore/53 => core/74}/filelists/openvpn | 0 config/rootfiles/core/{71 => 74}/filelists/squid | 0 .../rootfiles/core/{72 => 74}/filelists/strongswan | 0 config/rootfiles/core/{70 => 74}/meta | 0 config/rootfiles/core/{73 => 74}/update.sh | 22 ++++++++++++---------- make.sh | 2 +- 10 files changed, 19 insertions(+), 11 deletions(-) copy config/rootfiles/core/{70 => 74}/exclude (100%) create mode 100644 config/rootfiles/core/74/filelists/files copy config/rootfiles/core/{72 => 74}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/53 => core/74}/filelists/openvpn (100%) copy config/rootfiles/core/{71 => 74}/filelists/squid (100%) copy config/rootfiles/core/{72 => 74}/filelists/strongswan (100%) copy config/rootfiles/core/{70 => 74}/meta (100%) copy config/rootfiles/core/{73 => 74}/update.sh (87%) Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 9be3581..c18b5ed 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1388,6 +1388,7 @@ srv/web/ipfire/cgi-bin/connscheduler.cgi srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/dmzholes.cgi diff --git a/config/rootfiles/core/74/exclude b/config/rootfiles/core/74/exclude new file mode 100644 index 0000000..321a931 --- /dev/null +++ b/config/rootfiles/core/74/exclude @@ -0,0 +1,17 @@ +srv/web/ipfire/html/proxy.pac +boot/config.txt +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/log/cache +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/74/filelists/files b/config/rootfiles/core/74/filelists/files new file mode 100644 index 0000000..74d2466 --- /dev/null +++ b/config/rootfiles/core/74/filelists/files @@ -0,0 +1,5 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/proxy.cgi +var/ipfire/header.pl +var/ipfire/langs diff --git a/config/rootfiles/core/74/filelists/i586/strongswan-padlock b/config/rootfiles/core/74/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/74/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/openvpn b/config/rootfiles/core/74/filelists/openvpn new file mode 120000 index 0000000..493f3f7 --- /dev/null +++ b/config/rootfiles/core/74/filelists/openvpn @@ -0,0 +1 @@ +../../../common/openvpn \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/squid b/config/rootfiles/core/74/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/74/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/74/filelists/strongswan b/config/rootfiles/core/74/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/74/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/core/74/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/74/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/74/update.sh b/config/rootfiles/core/74/update.sh new file mode 100644 index 0000000..3f8abce --- /dev/null +++ b/config/rootfiles/core/74/update.sh @@ -0,0 +1,83 @@ +#!/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) 2013 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=74 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# +#Stop services +/etc/init.d/ipsec stop +/etc/init.d/squid stop + + +# +#Extract files +extract_files + +if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then + ( + eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) + + if [ "${TRANSPARENT_PORT}" = "81" ]; then + sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \ + -i /var/ipfire/proxy/advanced/settings + fi + ) +fi + +# Regenerate squid configuration files. +/srv/web/ipfire/cgi-bin/proxy.cgi +chown nobody:nobody /var/ipfire/proxy/squid.conf + +# +#Start services +/etc/init.d/squid start + +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi + +# +#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/make.sh b/make.sh index ef98d6f..c90e89d 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.13" # Version number -CORE="73" # Core Level (Filename) +CORE="74" # Core Level (Filename) PAKFIRE_CORE="73" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 09efb767f43718512311357a5634d00c8ad8c32e
by git＠ipfire.org 01 Dec '13

01 Dec '13

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, fifteen has been updated via 09efb767f43718512311357a5634d00c8ad8c32e (commit) via ea04338b4d3702faf7619b0ed08d8441bbc9d60e (commit) from 0037264780e516ef1cd85c1a73b178097b3201d6 (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 09efb767f43718512311357a5634d00c8ad8c32e Merge: ea04338 0037264 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 1 14:09:02 2013 +0100 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen commit ea04338b4d3702faf7619b0ed08d8441bbc9d60e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Dec 1 14:08:08 2013 +0100 rootfile fixes for arm. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.armv5tel-ipfire-multi | 5 +- config/rootfiles/common/armv5tel/util-linux | 221 ++++++++++++++++++---- config/rootfiles/common/strongswan | 2 +- 3 files changed, 191 insertions(+), 37 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index 868a50c..adbc650 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.10.11-ipfire-multi Kernel Configuration +# Linux/arm 3.10.21 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -615,6 +615,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set +CONFIG_KUSER_HELPERS=y CONFIG_DMA_CACHE_RWFO=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y @@ -1186,7 +1187,7 @@ CONFIG_L2TP_V3=y CONFIG_L2TP_IP=m CONFIG_L2TP_ETH=m CONFIG_STP=y -CONFIG_GARP=y +CONFIG_GARP=m CONFIG_BRIDGE=y CONFIG_BRIDGE_IGMP_SNOOPING=y CONFIG_BRIDGE_VLAN_FILTERING=y diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index d3a010c..2cefab0 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -1,17 +1,25 @@ -#bin/arch bin/dmesg +bin/findmnt +bin/lsblk bin/more bin/mount bin/umount -etc/fdprm +bin/wdctl +lib/libblkid.so.1.1.0 +lib/libmount.so.1 +lib/libmount.so.1.1.0 +lib/libuuid.so.1.3.0 sbin/agetty +sbin/blkdiscard sbin/blockdev sbin/cfdisk +sbin/chcpu sbin/ctrlaltdel -#sbin/elvtune sbin/fdisk #sbin/fsck.cramfs sbin/fsck.minix +sbin/fsfreeze +sbin/fstrim sbin/hwclock sbin/losetup sbin/mkfs @@ -19,46 +27,160 @@ sbin/mkfs #sbin/mkfs.cramfs sbin/mkfs.minix sbin/mkswap +sbin/nologin #sbin/pivot_root +sbin/raw sbin/sfdisk +sbin/swaplabel sbin/swapoff sbin/swapon +sbin/switch_root +sbin/wipefs #usr/bin/cal -#usr/bin/chkdupexe +#usr/bin/chrt #usr/bin/col #usr/bin/colcrt #usr/bin/colrm #usr/bin/column #usr/bin/cytune -#usr/bin/ddate -usr/bin/fdformat +usr/bin/eject +usr/bin/fallocate usr/bin/flock usr/bin/getopt #usr/bin/hexdump +usr/bin/ionice +#usr/bin/ipcmk #usr/bin/ipcrm #usr/bin/ipcs #usr/bin/isosize -#usr/bin/line +#usr/bin/linux32 +#usr/bin/linux64 usr/bin/logger #usr/bin/look +usr/bin/lscpu +usr/bin/lslocks #usr/bin/mcookie #usr/bin/namei +usr/bin/nsenter usr/bin/pg -#usr/bin/raw +usr/bin/prlimit usr/bin/rename usr/bin/renice #usr/bin/rev #usr/bin/script -#usr/bin/setfdprm +#usr/bin/scriptreplay +#usr/bin/setarch #usr/bin/setsid #usr/bin/setterm #usr/bin/tailf +#usr/bin/taskset #usr/bin/ul +#usr/bin/unshare #usr/bin/whereis -#usr/bin/write +#usr/include/libmount +#usr/include/libmount/libmount.h +#usr/lib/libblkid.la +#usr/lib/libmount.a +#usr/lib/libmount.la +usr/lib/libmount.so +#usr/lib/libuuid.la +#usr/lib/pkgconfig/mount.pc +usr/sbin/addpart +usr/sbin/delpart +usr/sbin/fdformat +usr/sbin/ldattach +usr/sbin/partx #usr/sbin/readprofile -#usr/sbin/tunelp -#usr/share/info/ipc.info +usr/sbin/resizepart +usr/sbin/rtcwake +#usr/share/bash-completion +#usr/share/bash-completion/completions +#usr/share/bash-completion/completions/addpart +#usr/share/bash-completion/completions/blkdiscard +#usr/share/bash-completion/completions/blkid +#usr/share/bash-completion/completions/blockdev +#usr/share/bash-completion/completions/cal +#usr/share/bash-completion/completions/cfdisk +#usr/share/bash-completion/completions/chcpu +#usr/share/bash-completion/completions/chrt +#usr/share/bash-completion/completions/col +#usr/share/bash-completion/completions/colcrt +#usr/share/bash-completion/completions/colrm +#usr/share/bash-completion/completions/column +#usr/share/bash-completion/completions/ctrlaltdel +#usr/share/bash-completion/completions/cytune +#usr/share/bash-completion/completions/delpart +#usr/share/bash-completion/completions/dmesg +#usr/share/bash-completion/completions/eject +#usr/share/bash-completion/completions/fallocate +#usr/share/bash-completion/completions/fdformat +#usr/share/bash-completion/completions/fdisk +#usr/share/bash-completion/completions/findmnt +#usr/share/bash-completion/completions/flock +#usr/share/bash-completion/completions/fsck +#usr/share/bash-completion/completions/fsck.cramfs +#usr/share/bash-completion/completions/fsck.minix +#usr/share/bash-completion/completions/fsfreeze +#usr/share/bash-completion/completions/fstrim +#usr/share/bash-completion/completions/getopt +#usr/share/bash-completion/completions/hexdump +#usr/share/bash-completion/completions/hwclock +#usr/share/bash-completion/completions/ionice +#usr/share/bash-completion/completions/ipcrm +#usr/share/bash-completion/completions/ipcs +#usr/share/bash-completion/completions/isosize +#usr/share/bash-completion/completions/ldattach +#usr/share/bash-completion/completions/logger +#usr/share/bash-completion/completions/look +#usr/share/bash-completion/completions/losetup +#usr/share/bash-completion/completions/lsblk +#usr/share/bash-completion/completions/lscpu +#usr/share/bash-completion/completions/lslocks +#usr/share/bash-completion/completions/mcookie +#usr/share/bash-completion/completions/mesg +#usr/share/bash-completion/completions/mkfs +#usr/share/bash-completion/completions/mkfs.bfs +#usr/share/bash-completion/completions/mkfs.cramfs +#usr/share/bash-completion/completions/mkfs.minix +#usr/share/bash-completion/completions/mkswap +#usr/share/bash-completion/completions/more +#usr/share/bash-completion/completions/mountpoint +#usr/share/bash-completion/completions/namei +#usr/share/bash-completion/completions/nsenter +#usr/share/bash-completion/completions/partx +#usr/share/bash-completion/completions/pg +#usr/share/bash-completion/completions/pivot_root +#usr/share/bash-completion/completions/prlimit +#usr/share/bash-completion/completions/raw +#usr/share/bash-completion/completions/readprofile +#usr/share/bash-completion/completions/rename +#usr/share/bash-completion/completions/renice +#usr/share/bash-completion/completions/resizepart +#usr/share/bash-completion/completions/rev +#usr/share/bash-completion/completions/rtcwake +#usr/share/bash-completion/completions/script +#usr/share/bash-completion/completions/scriptreplay +#usr/share/bash-completion/completions/setarch +#usr/share/bash-completion/completions/setsid +#usr/share/bash-completion/completions/setterm +#usr/share/bash-completion/completions/sfdisk +#usr/share/bash-completion/completions/swaplabel +#usr/share/bash-completion/completions/swapon +#usr/share/bash-completion/completions/tailf +#usr/share/bash-completion/completions/taskset +#usr/share/bash-completion/completions/ul +#usr/share/bash-completion/completions/unshare +#usr/share/bash-completion/completions/utmpdump +#usr/share/bash-completion/completions/uuidd +#usr/share/bash-completion/completions/uuidgen +#usr/share/bash-completion/completions/wall +#usr/share/bash-completion/completions/wdctl +#usr/share/bash-completion/completions/whereis +#usr/share/bash-completion/completions/wipefs +#usr/share/doc/util-linux +#usr/share/doc/util-linux/getopt +#usr/share/doc/util-linux/getopt/getopt-parse.bash +#usr/share/doc/util-linux/getopt/getopt-parse.tcsh #usr/share/locale/ca/LC_MESSAGES/util-linux.mo #usr/share/locale/cs/LC_MESSAGES/util-linux.mo #usr/share/locale/da/LC_MESSAGES/util-linux.mo @@ -67,12 +189,21 @@ usr/bin/renice #usr/share/locale/et #usr/share/locale/et/LC_MESSAGES #usr/share/locale/et/LC_MESSAGES/util-linux.mo +#usr/share/locale/eu +#usr/share/locale/eu/LC_MESSAGES +#usr/share/locale/eu/LC_MESSAGES/util-linux.mo #usr/share/locale/fi/LC_MESSAGES/util-linux.mo #usr/share/locale/fr/LC_MESSAGES/util-linux.mo +#usr/share/locale/gl/LC_MESSAGES/util-linux.mo +#usr/share/locale/hr/LC_MESSAGES/util-linux.mo +#usr/share/locale/hu/LC_MESSAGES/util-linux.mo +#usr/share/locale/id/LC_MESSAGES/util-linux.mo #usr/share/locale/it/LC_MESSAGES/util-linux.mo #usr/share/locale/ja/LC_MESSAGES/util-linux.mo #usr/share/locale/nl/LC_MESSAGES/util-linux.mo +#usr/share/locale/pl/LC_MESSAGES/util-linux.mo #usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo +#usr/share/locale/ru/LC_MESSAGES/util-linux.mo #usr/share/locale/sl #usr/share/locale/sl/LC_MESSAGES #usr/share/locale/sl/LC_MESSAGES/util-linux.mo @@ -81,68 +212,90 @@ usr/bin/renice #usr/share/locale/uk #usr/share/locale/uk/LC_MESSAGES #usr/share/locale/uk/LC_MESSAGES/util-linux.mo -#usr/share/man/man1/arch.1 +#usr/share/locale/vi/LC_MESSAGES/util-linux.mo +#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo +#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo #usr/share/man/man1/cal.1 -#usr/share/man/man1/chkdupexe.1 +#usr/share/man/man1/chrt.1 #usr/share/man/man1/col.1 #usr/share/man/man1/colcrt.1 #usr/share/man/man1/colrm.1 #usr/share/man/man1/column.1 -#usr/share/man/man1/ddate.1 +#usr/share/man/man1/dmesg.1 +#usr/share/man/man1/eject.1 +#usr/share/man/man1/fallocate.1 #usr/share/man/man1/flock.1 #usr/share/man/man1/getopt.1 #usr/share/man/man1/hexdump.1 -#usr/share/man/man1/line.1 +#usr/share/man/man1/ionice.1 +#usr/share/man/man1/ipcmk.1 +#usr/share/man/man1/ipcrm.1 +#usr/share/man/man1/ipcs.1 #usr/share/man/man1/look.1 +#usr/share/man/man1/lscpu.1 #usr/share/man/man1/mcookie.1 #usr/share/man/man1/more.1 #usr/share/man/man1/namei.1 +#usr/share/man/man1/nsenter.1 #usr/share/man/man1/pg.1 -#usr/share/man/man1/readprofile.1 +#usr/share/man/man1/prlimit.1 #usr/share/man/man1/rename.1 +#usr/share/man/man1/renice.1 #usr/share/man/man1/rev.1 #usr/share/man/man1/script.1 +#usr/share/man/man1/scriptreplay.1 +#usr/share/man/man1/setsid.1 #usr/share/man/man1/setterm.1 #usr/share/man/man1/tailf.1 +#usr/share/man/man1/taskset.1 #usr/share/man/man1/ul.1 +#usr/share/man/man1/unshare.1 #usr/share/man/man1/whereis.1 -#usr/share/man/man1/write.1 +#usr/share/man/man3/uuid_generate_time_safe.3 #usr/share/man/man5/fstab.5 -#usr/share/man/man5/nfs.5 +#usr/share/man/man8/addpart.8 #usr/share/man/man8/agetty.8 +#usr/share/man/man8/blkdiscard.8 #usr/share/man/man8/blockdev.8 #usr/share/man/man8/cfdisk.8 +#usr/share/man/man8/chcpu.8 #usr/share/man/man8/ctrlaltdel.8 #usr/share/man/man8/cytune.8 -#usr/share/man/man8/dmesg.8 -#usr/share/man/man8/elvtune.8 +#usr/share/man/man8/delpart.8 #usr/share/man/man8/fdformat.8 #usr/share/man/man8/fdisk.8 +#usr/share/man/man8/findmnt.8 +#usr/share/man/man8/fsck.cramfs.8 #usr/share/man/man8/fsck.minix.8 +#usr/share/man/man8/fsfreeze.8 +#usr/share/man/man8/fstrim.8 #usr/share/man/man8/hwclock.8 -#usr/share/man/man8/ipcrm.8 -#usr/share/man/man8/ipcs.8 #usr/share/man/man8/isosize.8 +#usr/share/man/man8/ldattach.8 +#usr/share/man/man8/linux32.8 +#usr/share/man/man8/linux64.8 #usr/share/man/man8/losetup.8 +#usr/share/man/man8/lsblk.8 +#usr/share/man/man8/lslocks.8 #usr/share/man/man8/mkfs.8 #usr/share/man/man8/mkfs.bfs.8 +#usr/share/man/man8/mkfs.cramfs.8 #usr/share/man/man8/mkfs.minix.8 #usr/share/man/man8/mkswap.8 #usr/share/man/man8/mount.8 +#usr/share/man/man8/nologin.8 +#usr/share/man/man8/partx.8 #usr/share/man/man8/pivot_root.8 #usr/share/man/man8/raw.8 -#usr/share/man/man8/renice.8 -#usr/share/man/man8/setfdprm.8 -#usr/share/man/man8/setsid.8 +#usr/share/man/man8/readprofile.8 +#usr/share/man/man8/resizepart.8 +#usr/share/man/man8/rtcwake.8 +#usr/share/man/man8/setarch.8 #usr/share/man/man8/sfdisk.8 -#usr/share/man/man8/sln.8 +#usr/share/man/man8/swaplabel.8 #usr/share/man/man8/swapoff.8 #usr/share/man/man8/swapon.8 -#usr/share/man/man8/tunelp.8 +#usr/share/man/man8/switch_root.8 #usr/share/man/man8/umount.8 -#usr/share/misc/getopt -#usr/share/misc/getopt/getopt-parse.bash -#usr/share/misc/getopt/getopt-parse.tcsh -#usr/share/misc/getopt/getopt-test.bash -#usr/share/misc/getopt/getopt-test.tcsh -var/lib/hwclock +#usr/share/man/man8/wdctl.8 +#usr/share/man/man8/wipefs.8 diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index 46b2465..0e18580 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -68,7 +68,7 @@ usr/lib/ipsec/plugins/libstrongswan-pkcs8.so usr/lib/ipsec/plugins/libstrongswan-pubkey.so usr/lib/ipsec/plugins/libstrongswan-random.so usr/lib/ipsec/plugins/libstrongswan-rc2.so -usr/lib/ipsec/plugins/libstrongswan-rdrand.so +#usr/lib/ipsec/plugins/libstrongswan-rdrand.so usr/lib/ipsec/plugins/libstrongswan-resolve.so usr/lib/ipsec/plugins/libstrongswan-revocation.so usr/lib/ipsec/plugins/libstrongswan-sha1.so hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM December 2013