IPFire-SCM August 2015

ipfire-scm@lists.ipfire.org

1 participants
37 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f098b3e1be7a7fef38380142f9f871bcc1baf5d8
by git＠ipfire.org 10 Aug '15

10 Aug '15

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 f098b3e1be7a7fef38380142f9f871bcc1baf5d8 (commit) from 59198bcef589351dcb338593a876f892bfdae3a7 (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 f098b3e1be7a7fef38380142f9f871bcc1baf5d8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 10 10:16:07 2015 +0200 core93: add pakfire changes to update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/93/filelists/files | 2 ++ 1 file changed, 2 insertions(+) Difference in files: diff --git a/config/rootfiles/core/93/filelists/files b/config/rootfiles/core/93/filelists/files index 4766ce5..bec26b8 100644 --- a/config/rootfiles/core/93/filelists/files +++ b/config/rootfiles/core/93/filelists/files @@ -1,5 +1,7 @@ etc/system-release etc/issue +opt/pakfire/pakfire +opt/pakfire/lib/functions.pl srv/web/ipfire/html/themes/darkdos/include/functions.pl srv/web/ipfire/html/themes/ipfire/include/css/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 59198bcef589351dcb338593a876f892bfdae3a7
by git＠ipfire.org 09 Aug '15

09 Aug '15

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 59198bcef589351dcb338593a876f892bfdae3a7 (commit) from 3dc6dceddd36673b39680f0c08f44aa1bb531687 (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 59198bcef589351dcb338593a876f892bfdae3a7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 9 10:43:58 2015 +0100 squid: Update rootfile Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 2 -- 1 file changed, 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index f0fb6e5..c8227e3 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -2082,8 +2082,6 @@ usr/lib/squid/errors/tr/error-details.txt usr/lib/squid/ext_edirectory_userip_acl usr/lib/squid/ext_file_userip_acl usr/lib/squid/ext_kerberos_ldap_group_acl -usr/lib/squid/negotiate_kerberos_auth -usr/lib/squid/negotiate_kerberos_auth_test usr/lib/squid/ext_ldap_group_acl usr/lib/squid/ext_session_acl usr/lib/squid/ext_sql_session_acl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3dc6dceddd36673b39680f0c08f44aa1bb531687
by git＠ipfire.org 08 Aug '15

08 Aug '15

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 3dc6dceddd36673b39680f0c08f44aa1bb531687 (commit) via e628f99413b025ec1f368d92fe751380a202f7c2 (commit) via ec27a5ae21ffa0023c2725a64b6a1141f331ad68 (commit) from e01ff6d89b464d8bae069cb54beaccb55c992ca2 (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 3dc6dceddd36673b39680f0c08f44aa1bb531687 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 7 20:40:19 2015 +0100 core93: Add updated squid Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e628f99413b025ec1f368d92fe751380a202f7c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 7 20:37:53 2015 +0100 Remove left-over squid patch file commit ec27a5ae21ffa0023c2725a64b6a1141f331ad68 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Aug 7 19:07:02 2015 +0200 squid: Update to 3.4.14 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 3 + .../{oldcore/92 => core/93}/filelists/squid | 0 config/rootfiles/core/93/update.sh | 4 + lfs/squid | 7 +- src/patches/squid-3.4-13225.patch | 284 --------------------- 5 files changed, 10 insertions(+), 288 deletions(-) copy config/rootfiles/{oldcore/92 => core/93}/filelists/squid (100%) delete mode 100644 src/patches/squid-3.4-13225.patch Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 1b78c8e..f0fb6e5 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -2082,6 +2082,8 @@ usr/lib/squid/errors/tr/error-details.txt usr/lib/squid/ext_edirectory_userip_acl usr/lib/squid/ext_file_userip_acl usr/lib/squid/ext_kerberos_ldap_group_acl +usr/lib/squid/negotiate_kerberos_auth +usr/lib/squid/negotiate_kerberos_auth_test usr/lib/squid/ext_ldap_group_acl usr/lib/squid/ext_session_acl usr/lib/squid/ext_sql_session_acl @@ -2173,6 +2175,7 @@ usr/sbin/updxlrator #usr/share/man/man8/ext_unix_group_acl.8 #usr/share/man/man8/ext_wbinfo_group_acl.8 #usr/share/man/man8/log_db_daemon.8 +#usr/share/man/man8/negotiate_kerberos_auth.8 #usr/share/man/man8/squid.8 #usr/share/man/man8/storeid_file_rewrite.8 #var/cache/squid diff --git a/config/rootfiles/core/93/filelists/squid b/config/rootfiles/core/93/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/93/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/93/update.sh b/config/rootfiles/core/93/update.sh index 737cb64..8199f20 100644 --- a/config/rootfiles/core/93/update.sh +++ b/config/rootfiles/core/93/update.sh @@ -32,6 +32,7 @@ do done # Stop services +/etc/init.d/squid stop # Extract files extract_files @@ -39,6 +40,9 @@ extract_files # Update Language cache /usr/local/bin/update-lang-cache +# Start services +/etc/init.d/squid start + # This update need a reboot... #touch /var/run/need_reboot diff --git a/lfs/squid b/lfs/squid index a338660..d8c8a05 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = 3.4.13 +VER = 3.4.14 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a5f6c978b2d7a99b161c8275e1acb470 +$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a install : $(TARGET) @@ -70,7 +70,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.4-13225.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc/squid \ diff --git a/src/patches/squid-3.4-13225.patch b/src/patches/squid-3.4-13225.patch deleted file mode 100644 index 9ccec5e..0000000 --- a/src/patches/squid-3.4-13225.patch +++ /dev/null @@ -1,284 +0,0 @@ ------------------------------------------------------------- -revno: 13225 -revision-id: squid3(a)treenet.co.nz-20150709032133-qg1patn5zngt4o4h -parent: squid3(a)treenet.co.nz-20150501100500-3utkhrao1yrd8ig6 -author: Alex Rousskov <rousskov(a)measurement-factory.com> -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Wed 2015-07-08 20:21:33 -0700 -message: - Do not blindly forward cache peer CONNECT responses. - - Squid blindly forwards cache peer CONNECT responses to clients. This - may break things if the peer responds with something like HTTP 403 - (Forbidden) and keeps the connection with Squid open: - - The client application issues a CONNECT request. - - Squid forwards this request to a cache peer. - - Cache peer correctly responds back with a "403 Forbidden". - - Squid does not parse cache peer response and - just forwards it as if it was a Squid response to the client. - - The TCP connections are not closed. - - At this stage, Squid is unaware that the CONNECT request has failed. All - subsequent requests on the user agent TCP connection are treated as - tunnelled traffic. Squid is forwarding these requests to the peer on the - TCP connection previously used for the 403-ed CONNECT request, without - proper processing. The additional headers which should have been applied - by Squid to these requests are not applied, and the requests are being - forwarded to the cache peer even though the Squid configuration may - state that these requests must go directly to the origin server. - - This fixes Squid to parse cache peer responses, and if an error response - found, respond with "502 Bad Gateway" to the client and close the - connections. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20150709032133-qg1patn5zngt4o4h -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 6cbce093f30c8a09173eb610eaa423c7c305ff23 -# timestamp: 2015-07-09 03:40:35 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20150501100500-\ -# 3utkhrao1yrd8ig6 -# -# Begin patch -=== modified file 'src/tunnel.cc' ---- src/tunnel.cc 2014-04-26 10:58:22 +0000 -+++ src/tunnel.cc 2015-07-09 03:21:33 +0000 -@@ -122,6 +122,10 @@ - (request->flags.interceptTproxy || request->flags.intercepted)); - } - -+ /// Sends "502 Bad Gateway" error response to the client, -+ /// if it is waiting for Squid CONNECT response, closing connections. -+ void informUserOfPeerError(const char *errMsg); -+ - class Connection - { - -@@ -139,13 +143,14 @@ - - void error(int const xerrno); - int debugLevelForError(int const xerrno) const; -- /// handles a non-I/O error associated with this Connection -- void logicError(const char *errMsg); - void closeIfOpen(); - void dataSent (size_t amount); -+ /// writes 'b' buffer, setting the 'writer' member to 'callback'. -+ void write(const char *b, int size, AsyncCall::Pointer &callback, FREE * free_func); - int len; - char *buf; - int64_t *size_ptr; /* pointer to size in an ConnStateData for logging */ -+ AsyncCall::Pointer writer; ///< pending Comm::Write callback - - Comm::ConnectionPointer conn; ///< The currently connected connection. - -@@ -195,13 +200,14 @@ - TunnelStateData *tunnelState = (TunnelStateData *)params.data; - debugs(26, 3, HERE << tunnelState->server.conn); - tunnelState->server.conn = NULL; -+ tunnelState->server.writer = NULL; - - if (tunnelState->noConnections()) { - delete tunnelState; - return; - } - -- if (!tunnelState->server.len) { -+ if (!tunnelState->client.writer) { - tunnelState->client.conn->close(); - return; - } -@@ -213,13 +219,14 @@ - TunnelStateData *tunnelState = (TunnelStateData *)params.data; - debugs(26, 3, HERE << tunnelState->client.conn); - tunnelState->client.conn = NULL; -+ tunnelState->client.writer = NULL; - - if (tunnelState->noConnections()) { - delete tunnelState; - return; - } - -- if (!tunnelState->client.len) { -+ if (!tunnelState->server.writer) { - tunnelState->server.conn->close(); - return; - } -@@ -343,6 +350,23 @@ - handleConnectResponse(len); - } - -+void -+TunnelStateData::informUserOfPeerError(const char *errMsg) -+{ -+ server.len = 0; -+ if (!clientExpectsConnectResponse()) { -+ // closing the connection is the best we can do here -+ debugs(50, 3, server.conn << " closing on error: " << errMsg); -+ server.conn->close(); -+ return; -+ } -+ ErrorState *err = new ErrorState(ERR_CONNECT_FAIL, Http::scBadGateway, request.getRaw()); -+ err->callback = tunnelErrorComplete; -+ err->callback_data = this; -+ *status_ptr = Http::scBadGateway; -+ errorSend(http->getConn()->clientConnection, err); -+} -+ - /* Read from client side and queue it for writing to the server */ - void - TunnelStateData::ReadConnectResponseDone(const Comm::ConnectionPointer &, char *buf, size_t len, comm_err_t errcode, int xerrno, void *data) -@@ -374,7 +398,7 @@ - const bool parsed = rep.parse(connectRespBuf, eof, &parseErr); - if (!parsed) { - if (parseErr > 0) { // unrecoverable parsing error -- server.logicError("malformed CONNECT response from peer"); -+ informUserOfPeerError("malformed CONNECT response from peer"); - return; - } - -@@ -383,7 +407,7 @@ - assert(!parseErr); - - if (!connectRespBuf->hasSpace()) { -- server.logicError("huge CONNECT response from peer"); -+ informUserOfPeerError("huge CONNECT response from peer"); - return; - } - -@@ -397,7 +421,8 @@ - - // bail if we did not get an HTTP 200 (Connection Established) response - if (rep.sline.status() != Http::scOkay) { -- server.logicError("unsupported CONNECT response status code"); -+ // if we ever decide to reuse the peer connection, we must extract the error response first -+ informUserOfPeerError("unsupported CONNECT response status code"); - return; - } - -@@ -416,13 +441,6 @@ - } - - void --TunnelStateData::Connection::logicError(const char *errMsg) --{ -- debugs(50, 3, conn << " closing on error: " << errMsg); -- conn->close(); --} -- --void - TunnelStateData::Connection::error(int const xerrno) - { - /* XXX fixme xstrerror and xerrno... */ -@@ -517,7 +535,7 @@ - debugs(26, 3, HERE << "Schedule Write"); - AsyncCall::Pointer call = commCbCall(5,5, "TunnelBlindCopyWriteHandler", - CommIoCbPtrFun(completion, this)); -- Comm::Write(to.conn, from.buf, len, call, NULL); -+ to.write(from.buf, len, call, NULL); - } - - /* Writes data from the client buffer to the server side */ -@@ -526,6 +544,7 @@ - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - assert (cbdataReferenceValid (tunnelState)); -+ tunnelState->server.writer = NULL; - - tunnelState->writeServerDone(buf, len, flag, xerrno); - } -@@ -575,6 +594,7 @@ - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - assert (cbdataReferenceValid (tunnelState)); -+ tunnelState->client.writer = NULL; - - tunnelState->writeClientDone(buf, len, flag, xerrno); - } -@@ -592,7 +612,14 @@ - } - - void --TunnelStateData::writeClientDone(char *buf, size_t len, comm_err_t flag, int xerrno) -+TunnelStateData::Connection::write(const char *b, int size, AsyncCall::Pointer &callback, FREE * free_func) -+{ -+ writer = callback; -+ Comm::Write(conn, b, size, callback, free_func); -+} -+ -+void -+TunnelStateData::writeClientDone(char *, size_t len, comm_err_t flag, int xerrno) - { - debugs(26, 3, HERE << client.conn << ", " << len << " bytes written, flag=" << flag); - -@@ -712,6 +739,7 @@ - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, HERE << conn << ", flag=" << flag); -+ tunnelState->client.writer = NULL; - - if (flag != COMM_OK) { - *tunnelState->status_ptr = Http::scInternalServerError; -@@ -728,6 +756,7 @@ - { - TunnelStateData *tunnelState = (TunnelStateData *)data; - debugs(26, 3, conn << ", flag=" << flag); -+ tunnelState->server.writer = NULL; - assert(tunnelState->waitingForConnectRequest()); - - if (flag != COMM_OK) { -@@ -768,7 +797,7 @@ - else { - AsyncCall::Pointer call = commCbCall(5,5, "tunnelConnectedWriteDone", - CommIoCbPtrFun(tunnelConnectedWriteDone, tunnelState)); -- Comm::Write(tunnelState->client.conn, conn_established, strlen(conn_established), call, NULL); -+ tunnelState->client.write(conn_established, strlen(conn_established), call, NULL); - } - } - -@@ -955,29 +984,20 @@ - debugs(11, 2, "Tunnel Server REQUEST: " << tunnelState->server.conn << ":\n----------\n" << - Raw("tunnelRelayConnectRequest", mb.content(), mb.contentSize()) << "\n----------"); - -- if (tunnelState->clientExpectsConnectResponse()) { -- // hack: blindly tunnel peer response (to our CONNECT request) to the client as ours. -- AsyncCall::Pointer writeCall = commCbCall(5,5, "tunnelConnectedWriteDone", -- CommIoCbPtrFun(tunnelConnectedWriteDone, tunnelState)); -- Comm::Write(srv, &mb, writeCall); -- } else { -- // we have to eat the connect response from the peer (so that the client -- // does not see it) and only then start shoveling data to the client -- AsyncCall::Pointer writeCall = commCbCall(5,5, "tunnelConnectReqWriteDone", -- CommIoCbPtrFun(tunnelConnectReqWriteDone, -- tunnelState)); -- Comm::Write(srv, &mb, writeCall); -- tunnelState->connectReqWriting = true; -- -- tunnelState->connectRespBuf = new MemBuf; -- // SQUID_TCP_SO_RCVBUF: we should not accumulate more than regular I/O buffer -- // can hold since any CONNECT response leftovers have to fit into server.buf. -- // 2*SQUID_TCP_SO_RCVBUF: HttpMsg::parse() zero-terminates, which uses space. -- tunnelState->connectRespBuf->init(SQUID_TCP_SO_RCVBUF, 2*SQUID_TCP_SO_RCVBUF); -- tunnelState->readConnectResponse(); -- -- assert(tunnelState->waitingForConnectExchange()); -- } -+ AsyncCall::Pointer writeCall = commCbCall(5,5, "tunnelConnectReqWriteDone", -+ CommIoCbPtrFun(tunnelConnectReqWriteDone, tunnelState)); -+ -+ tunnelState->server.write(mb.buf, mb.size, writeCall, mb.freeFunc()); -+ tunnelState->connectReqWriting = true; -+ -+ tunnelState->connectRespBuf = new MemBuf; -+ // SQUID_TCP_SO_RCVBUF: we should not accumulate more than regular I/O buffer -+ // can hold since any CONNECT response leftovers have to fit into server.buf. -+ // 2*SQUID_TCP_SO_RCVBUF: HttpMsg::parse() zero-terminates, which uses space. -+ tunnelState->connectRespBuf->init(SQUID_TCP_SO_RCVBUF, 2*SQUID_TCP_SO_RCVBUF); -+ tunnelState->readConnectResponse(); -+ -+ assert(tunnelState->waitingForConnectExchange()); - - AsyncCall::Pointer timeoutCall = commCbCall(5, 4, "tunnelTimeout", - CommTimeoutCbPtrFun(tunnelTimeout, tunnelState)); - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e01ff6d89b464d8bae069cb54beaccb55c992ca2
by git＠ipfire.org 03 Aug '15

03 Aug '15

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 e01ff6d89b464d8bae069cb54beaccb55c992ca2 (commit) via 3ab34d23f6997d3977804001c54634c7ea051e09 (commit) via 2b1af3e9eef690971445b4261ee7030ca2a2a48d (commit) via 255e14216dac0c3077752f6a90587f257d94da2a (commit) from 81469c10d0311cd2d8c53e24f67d9c0ed6aa6b94 (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 e01ff6d89b464d8bae069cb54beaccb55c992ca2 Author: Matthias Fischer <fischerm42(a)t-online.de> Date: Sun Aug 2 21:13:55 2015 +0200 cups: Update to 2.0.4 Signed-off-by: Matthias Fischer <fischerm42(a)t-online.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3ab34d23f6997d3977804001c54634c7ea051e09 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 2 21:34:31 2015 +0100 core93: Add updated daq Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2b1af3e9eef690971445b4261ee7030ca2a2a48d Author: Matthias Fischer <fischerm42(a)t-online.de> Date: Fri Jul 31 15:37:47 2015 +0200 daq: Update to 2.0.6 Signed-off-by: Matthias Fischer <fischerm42(a)t-online.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 255e14216dac0c3077752f6a90587f257d94da2a Author: Matthias Fischer <fischerm(a)ipfire.org> Date: Sat Jun 27 11:19:17 2015 +0200 daq: Update to 2.0.5 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/89 => core/93}/filelists/daq | 0 config/rootfiles/packages/cups | 2 +- lfs/cups | 6 +++--- lfs/daq | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) copy config/rootfiles/{oldcore/89 => core/93}/filelists/daq (100%) Difference in files: diff --git a/config/rootfiles/core/93/filelists/daq b/config/rootfiles/core/93/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/93/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 513cf4c..0604867 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -670,6 +670,7 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man5/client.conf.5.gz #usr/share/man/man5/cups-files.conf.5.gz #usr/share/man/man5/cups-snmp.conf.5.gz +#usr/share/man/man5/cupsd-logs.5.gz #usr/share/man/man5/cupsd.conf.5.gz #usr/share/man/man5/ipptoolfile.5.gz #usr/share/man/man5/mailto.conf.5.gz @@ -691,7 +692,6 @@ usr/share/locale/ru/cups_ru.po #usr/share/man/man8/cupsaddsmb.8.gz #usr/share/man/man8/cupsctl.8.gz #usr/share/man/man8/cupsd-helper.8.gz -#usr/share/man/man8/cupsd-logs.8.gz #usr/share/man/man8/cupsd.8.gz #usr/share/man/man8/cupsdisable.8.gz #usr/share/man/man8/cupsenable.8.gz diff --git a/lfs/cups b/lfs/cups index e0ef962..49b275a 100644 --- a/lfs/cups +++ b/lfs/cups @@ -24,7 +24,7 @@ include Config -VER = 2.0.3 +VER = 2.0.4 THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 12 +PAK_VER = 13 DEPS = "ghostscript" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8d98b85edbdab7ab03739c9622f570e8 +$(DL_FILE)_MD5 = f5c847d9a4fac6c4c66fb0526a7afaae install : $(TARGET) diff --git a/lfs/daq b/lfs/daq index c58995d..35f8241 100644 --- a/lfs/daq +++ b/lfs/daq @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2015 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 = 2.0.4 +VER = 2.0.6 THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 65e51d72e9d5d8b397e192e4e5857eff +$(DL_FILE)_MD5 = 2cd6da422a72c129c685fc4bb848c24c install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81469c10d0311cd2d8c53e24f67d9c0ed6aa6b94
by git＠ipfire.org 01 Aug '15

01 Aug '15

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 81469c10d0311cd2d8c53e24f67d9c0ed6aa6b94 (commit) via 52f8264bda52fd200a9c7f8e50892b6904802311 (commit) from 9e462c59710cad7f8a16a068b3a4ce0a075624c9 (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 81469c10d0311cd2d8c53e24f67d9c0ed6aa6b94 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 1 20:46:55 2015 +0100 core93: Add libpcap update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 52f8264bda52fd200a9c7f8e50892b6904802311 Author: Matthias Fischer <fischerm42(a)t-online.de> Date: Fri Jul 31 15:42:05 2015 +0200 libpcap: Update to 1.7.4 Signed-off-by: Matthias Fischer <fischerm42(a)t-online.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/libpcap | 2 +- config/rootfiles/{oldcore/92 => core/93}/filelists/libpcap | 0 lfs/libpcap | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) copy config/rootfiles/{oldcore/92 => core/93}/filelists/libpcap (100%) Difference in files: diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 9031c6e..2045ca7 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -15,7 +15,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.7.3 +usr/lib/libpcap.so.1.7.4 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap diff --git a/config/rootfiles/core/93/filelists/libpcap b/config/rootfiles/core/93/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/93/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/lfs/libpcap b/lfs/libpcap index 32b2f36..10fbcd4 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -24,7 +24,7 @@ include Config -VER = 1.7.3 +VER = 1.7.4 THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9ce284eacc02cb5491e123b875f3f63c +$(DL_FILE)_MD5 = b2e13142bbaba857ab1c6894aedaf547 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9e462c59710cad7f8a16a068b3a4ce0a075624c9
by git＠ipfire.org 01 Aug '15

01 Aug '15

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 9e462c59710cad7f8a16a068b3a4ce0a075624c9 (commit) from d08045eaa69a0bab6cb273c1836d34a433f60a37 (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 9e462c59710cad7f8a16a068b3a4ce0a075624c9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 1 20:38:43 2015 +0100 backup: Add /etc/ipsec.user-post.conf This file can be manually edited by the user and should be included in the backup. Reported-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/core/93/filelists/files | 1 + 2 files changed, 2 insertions(+) Difference in files: diff --git a/config/backup/include b/config/backup/include index 159ff9a..6ecb930 100644 --- a/config/backup/include +++ b/config/backup/include @@ -9,6 +9,7 @@ /etc/shadow /etc/group /etc/ipsec.user.* +/etc/ipsec.user-post.conf /etc/sysconfig/* /etc/hosts* /etc/httpd/* diff --git a/config/rootfiles/core/93/filelists/files b/config/rootfiles/core/93/filelists/files index c00f88a..4766ce5 100644 --- a/config/rootfiles/core/93/filelists/files +++ b/config/rootfiles/core/93/filelists/files @@ -5,4 +5,5 @@ srv/web/ipfire/html/themes/ipfire/include/css/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl srv/web/ipfire/html/themes/maniac/include/functions.pl +var/ipfire/backup/include var/ipfire/langs hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d08045eaa69a0bab6cb273c1836d34a433f60a37
by git＠ipfire.org 01 Aug '15

01 Aug '15

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 d08045eaa69a0bab6cb273c1836d34a433f60a37 (commit) via a862fbc0ce8960d2434243b7466404559259adfd (commit) via fcd2b9299c39388328c3d4fb89f098f32b39d400 (commit) from 6b6b876b8d26485e6d916fdd8e08c621d863068a (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 d08045eaa69a0bab6cb273c1836d34a433f60a37 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 1 20:23:34 2015 +0100 dnsmasq: Update to 2.75 Rather severe regression in handling DNSSEC with CNAMEs. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a862fbc0ce8960d2434243b7466404559259adfd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 1 20:10:34 2015 +0100 core93: Add bind update Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fcd2b9299c39388328c3d4fb89f098f32b39d400 Author: Matthias Fischer <fischerm42(a)t-online.de> Date: Sat Aug 1 12:41:23 2015 +0200 bind: Update to 9.10.2-P3 Signed-off-by: Matthias Fischer <fischerm42(a)t-online.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/80 => core/93}/filelists/bind | 0 .../{oldcore/92 => core/93}/filelists/dnsmasq | 0 lfs/bind | 4 +-- lfs/dnsmasq | 4 +-- ...q-Add-support-to-read-ISC-DHCP-lease-file.patch | 32 +++++++++++----------- 5 files changed, 20 insertions(+), 20 deletions(-) copy config/rootfiles/{oldcore/80 => core/93}/filelists/bind (100%) copy config/rootfiles/{oldcore/92 => core/93}/filelists/dnsmasq (100%) Difference in files: diff --git a/config/rootfiles/core/93/filelists/bind b/config/rootfiles/core/93/filelists/bind new file mode 120000 index 0000000..48a0eba --- /dev/null +++ b/config/rootfiles/core/93/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/93/filelists/dnsmasq b/config/rootfiles/core/93/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/93/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/lfs/bind b/lfs/bind index 5dd098d..f6190a5 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.10.2-P2 +VER = 9.10.2-P3 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 55d8f094bc10baae0e23e5e9100ba320 +$(DL_FILE)_MD5 = a810d5d65fbdcf28dcda80d646913c3a install : $(TARGET) diff --git a/lfs/dnsmasq b/lfs/dnsmasq index e4410cc..f327967 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -24,7 +24,7 @@ include Config -VER = 2.73 +VER = 2.75 THISAPP = dnsmasq-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b8bfe96d22945c8cf4466826ba9b21bd +$(DL_FILE)_MD5 = 887236f1ddde6eb57cdb9d01916c9f72 install : $(TARGET) diff --git a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch index 1a89b36..0482c4b 100644 --- a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch +++ b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch @@ -1,18 +1,19 @@ diff --git a/Makefile b/Makefile -index 2910320b6452..0a76ce3c5154 100644 +index 4c87ea9..4e0ea10 100644 --- a/Makefile +++ b/Makefile -@@ -73,7 +73,7 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \ +@@ -73,7 +73,8 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \ dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \ helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \ dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \ -- domain.o dnssec.o blockdata.o tables.o loop.o inotify.o -+ domain.o dnssec.o blockdata.o tables.o loop.o inotify.o isc.o +- domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o ++ domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o \ ++ isc.o hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \ dns-protocol.h radv-protocol.h ip6addr.h diff --git a/src/cache.c b/src/cache.c -index 117ae279fd4e..6ee7ee362e6c 100644 +index 178d654..6d0b131 100644 --- a/src/cache.c +++ b/src/cache.c @@ -17,7 +17,7 @@ @@ -65,10 +66,10 @@ index 117ae279fd4e..6ee7ee362e6c 100644 cache_hash(crec); diff --git a/src/dnsmasq.c b/src/dnsmasq.c -index e903a24c8105..eefc7f939933 100644 +index 81254f6..ce2d1a7 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c -@@ -970,6 +970,11 @@ int main (int argc, char **argv) +@@ -982,6 +982,11 @@ int main (int argc, char **argv) poll_resolv(0, daemon->last_resolv != 0, now); daemon->last_resolv = now; @@ -81,21 +82,20 @@ index e903a24c8105..eefc7f939933 100644 #endif diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 89e758b56a0a..c5edd6fdf7f5 100644 +index cf1a782..30437aa 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h -@@ -1502,3 +1502,8 @@ void inotify_dnsmasq_init(); - int inotify_check(time_t now); - void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revhashsz); - #endif -+ +@@ -1519,3 +1519,7 @@ int poll_check(int fd, short event); + void poll_listen(int fd, short event); + int do_poll(int timeout); + +/* isc.c */ +#ifdef HAVE_ISC_READER +void load_dhcp(time_t now); +#endif diff --git a/src/isc.c b/src/isc.c new file mode 100644 -index 000000000000..51064426f17f +index 0000000..5106442 --- /dev/null +++ b/src/isc.c @@ -0,0 +1,251 @@ @@ -351,10 +351,10 @@ index 000000000000..51064426f17f + +#endif diff --git a/src/option.c b/src/option.c -index cb4e76ba0aa2..f6420fcbb7ab 100644 +index ecc2619..527c5aa 100644 --- a/src/option.c +++ b/src/option.c -@@ -1693,7 +1693,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma +@@ -1699,7 +1699,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma ret_err(_("bad MX target")); break; 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 August 2015