IPFire-SCM August 2010

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 191e8b049e33fc529ca87ddd7dd118a4a06a867a
by git＠ipfire.org 02 Aug '10

02 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 191e8b049e33fc529ca87ddd7dd118a4a06a867a (commit) via 8592b4dac265dc6a14ac1c0cd870778de599a2e2 (commit) via de45a98089bf99856cf1dfdcd4b5780ddb08bdcd (commit) via 93c5933634377b9cf31aa65b1611da7b935540b1 (commit) via 789a10989cb07b698b988dbb61d4ead3464f2108 (commit) via 7d288e76d142c42ab7c800b6a25cb73bd6493211 (commit) via 244d7a735c84e6c74afb828ed6294b87bf770edf (commit) via 6d535f727f97cd86dfd63b1c430c289d76d776af (commit) via 021a6fe9ccf61bc92fc6054751b63b962c737f0a (commit) via c836aac1960d22b35bba23ebb0a979266273bb51 (commit) via c4e1249d0baf9d84b3a2f7cedcc7eb8e402dfd89 (commit) via eadd9921208482bfd4ef6d311f8e964c09612695 (commit) from 55b0487810513ea7e7a8bfbc185e6d91544c01b8 (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 191e8b049e33fc529ca87ddd7dd118a4a06a867a Merge: 8592b4d 55b0487 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 22:21:25 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 8592b4dac265dc6a14ac1c0cd870778de599a2e2 Merge: 61a300f de45a98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 22:21:14 2010 +0200 Merge commit 'de45a98089bf99856cf1dfdcd4b5780ddb08bdcd' commit de45a98089bf99856cf1dfdcd4b5780ddb08bdcd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 00:48:33 2010 +0200 bootchart2: New package. commit 93c5933634377b9cf31aa65b1611da7b935540b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 21:42:00 2010 +0200 tunctl: New package. commit 789a10989cb07b698b988dbb61d4ead3464f2108 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 11:17:23 2010 +0200 udev: Update to 160. commit 7d288e76d142c42ab7c800b6a25cb73bd6493211 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 17:43:45 2010 +0200 pptp: Import patches. commit 244d7a735c84e6c74afb828ed6294b87bf770edf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 17:27:11 2010 +0200 Revert "pptp: Fix build error on linux." This reverts commit c836aac1960d22b35bba23ebb0a979266273bb51. commit 6d535f727f97cd86dfd63b1c430c289d76d776af Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 10:03:33 2010 +0200 toolchain: Omit autoreconf in coreutils. Generally, we need this here but only for the testsuite that isn't run. commit 021a6fe9ccf61bc92fc6054751b63b962c737f0a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 10:02:38 2010 +0200 cpio: Need no autoreconf here. commit c836aac1960d22b35bba23ebb0a979266273bb51 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 09:58:31 2010 +0200 pptp: Fix build error on linux. Removed pptp_compat.c because there is only some stuff for solaris in it. commit c4e1249d0baf9d84b3a2f7cedcc7eb8e402dfd89 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 09:58:12 2010 +0200 Revert "pptp: Patch to fix build on linux systems." This reverts commit eadd9921208482bfd4ef6d311f8e964c09612695. commit eadd9921208482bfd4ef6d311f8e964c09612695 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 30 09:41:29 2010 +0200 pptp: Patch to fix build on linux systems. ----------------------------------------------------------------------- Summary of changes: .../btrfs-progs.nm => bootchart2/bootchart2.nm} | 18 +- pkgs/core/cpio/cpio.nm | 6 - pkgs/core/pptp/patches/pptp-1.7.2-compat.patch | 71 ++++++++ pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch | 90 ++++++++++ pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch | 83 +++++++++ pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch | 186 ++++++++++++++++++++ pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch | 80 +++++++++ .../patches/pptp-1.7.2-pptpsetup-encrypt.patch | 22 +++ .../pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch | 47 +++++ pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch | 23 +++ pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch | 16 ++ pkgs/core/pptp/pptp.nm | 3 +- .../{etherwake/etherwake.nm => tunctl/tunctl.nm} | 24 ++- pkgs/core/udev/udev.nm | 2 +- pkgs/toolchain/coreutils/coreutils.nm | 2 + 15 files changed, 645 insertions(+), 28 deletions(-) copy pkgs/core/{btrfs-progs/btrfs-progs.nm => bootchart2/bootchart2.nm} (80%) create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-compat.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch create mode 100644 pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch copy pkgs/core/{etherwake/etherwake.nm => tunctl/tunctl.nm} (76%) Difference in files: diff --git a/pkgs/core/bootchart2/bootchart2.nm b/pkgs/core/bootchart2/bootchart2.nm new file mode 100644 index 0000000..f5c1709 --- /dev/null +++ b/pkgs/core/bootchart2/bootchart2.nm @@ -0,0 +1,50 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = bootchart2 +PKG_VER = 0.12.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Statistics +PKG_URL = http://github.com/mmeeks/bootchart +PKG_LICENSE = GPLv2 +PKG_SUMMARY = Graphs the boot process. + +define PKG_DESCRIPTION + Graphs the boot process of the system and lets the user see what \ + consumes the most time and cpu power or I/O performance. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +define STAGE_BUILD + cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(PARALLELISMFLAGS) +endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install-collector DESTDIR=$(BUILDROOT) +endef diff --git a/pkgs/core/cpio/cpio.nm b/pkgs/core/cpio/cpio.nm index 9fe8cb6..2174b3d 100644 --- a/pkgs/core/cpio/cpio.nm +++ b/pkgs/core/cpio/cpio.nm @@ -34,8 +34,6 @@ PKG_URL = http://www.gnu.org/software/cpio/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = A GNU archiving program. -PKG_BUILD_DEPS+= autoconf automake - define PKG_DESCRIPTION GNU cpio copies files into or out of a cpio or tar archive. Archives \ are files which contain a collection of other files plus information \ @@ -51,10 +49,6 @@ CONFIGURE_OPTIONS += \ --libexecdir=/tmp \ --with-rmt=/usr/sbin/rmt -define STAGE_PREPARE_CMDS - cd $(DIR_APP) && autoreconf --force -endef - define STAGE_TEST cd $(DIR_APP) && make check endef diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-compat.patch b/pkgs/core/pptp/patches/pptp-1.7.2-compat.patch new file mode 100644 index 0000000..a6456fc --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-compat.patch @@ -0,0 +1,71 @@ +Index: pptp_compat.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v +retrieving revision 1.1 +retrieving revision 1.3 +diff -u -r1.1 -r1.3 +--- a/pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1 ++++ b/pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3 +@@ -7,14 +7,15 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <unistd.h> +-#include <stropts.h> + #include <stdlib.h> ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++#include <stropts.h> ++#endif + #include <strings.h> + #include "pptp_compat.h" + #include <stdio.h> + #include "util.h" + +- + #if defined (__SVR4) && defined (__sun) /* Solaris */ + /* + * daemon implementation from uClibc +Index: pptp.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v +retrieving revision 1.49 +retrieving revision 1.51 +diff -u -r1.49 -r1.51 +--- a/pptp.c 14 May 2008 06:32:52 -0000 1.49 ++++ b/pptp.c 24 Jul 2008 05:53:05 -0000 1.51 +@@ -61,9 +61,8 @@ + #include "version.h" + #if defined(__linux__) + #include <sys/prctl.h> +-#else +-#include "inststr.h" + #endif ++#include "inststr.h" + #include "util.h" + #include "pptp_quirks.h" + #include "pqueue.h" +@@ -129,7 +128,7 @@ + } + + #if defined (__SVR4) && defined (__sun) +-struct in_addr localbind = { INADDR_ANY }; ++struct in_addr localbind = { .s_addr = INADDR_ANY }; + #else + struct in_addr localbind = { INADDR_NONE }; + #endif +@@ -183,6 +182,7 @@ + struct in_addr inetaddr; + volatile int callmgr_sock = -1; + char ttydev[PATH_MAX]; ++ char *tty_name; + int pty_fd, tty_fd, gre_fd, rc; + volatile pid_t parent_pid, child_pid; + u_int16_t call_id, peer_call_id; +@@ -391,7 +391,7 @@ + file2fd("/dev/null", "wb", STDERR_FILENO); + } + +- char *tty_name = ttyname(tty_fd); ++ tty_name = ttyname(tty_fd); + snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", + tty_name ? tty_name : "(null)"); + #ifdef PR_SET_NAME diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch b/pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch new file mode 100644 index 0000000..331e92e --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-conn-free.patch @@ -0,0 +1,90 @@ +Tue Jun 15 15:00:40 2010 James Cameron <quozl(a)laptop.org> + + * pptp_ctrl.c (pptp_conn_is_dead): immediately destroying the + connection and freeing the structure has led to segmentation + faults on more recent heap implementations, since we use the + structure after it has been freed. + + Defer the free of the structure until after all uses of it have + ceased, by adding a connection state for dead and terminating the + main loop once it is detected. + +--- a/pptp_callmgr.c 2008-05-14 07:33:55.000000000 +0100 ++++ b/pptp_callmgr.c 2010-06-15 14:32:00.478100392 +0100 +@@ -167,6 +170,7 @@ + do { + int rc; + fd_set read_set = call_set, write_set; ++ if (pptp_conn_is_dead(conn)) break; + FD_ZERO (&write_set); + if (pptp_conn_established(conn)) { + FD_SET (unix_sock, &read_set); +@@ -294,6 +298,7 @@ + } + /* with extreme prejudice */ + pptp_conn_destroy(conn); ++ pptp_conn_free(conn); + vector_destroy(call_list); + } + cleanup: +--- a/pptp_ctrl.c 2008-05-14 07:33:55.000000000 +0100 ++++ b/pptp_ctrl.c 2010-06-15 14:32:00.480100647 +0100 +@@ -58,8 +62,11 @@ + struct PPTP_CONN { + int inet_sock; + /* Connection States */ +- enum { +- CONN_IDLE, CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, CONN_ESTABLISHED ++ enum { ++ CONN_IDLE, ++ CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, ++ CONN_ESTABLISHED, ++ CONN_DEAD + } conn_state; /* on startup: CONN_IDLE */ + /* Keep-alive states */ + enum { +@@ -448,6 +457,16 @@ + close(conn->inet_sock); + /* deallocate */ + vector_destroy(conn->call); ++ conn->conn_state = CONN_DEAD; ++} ++ ++int pptp_conn_is_dead(PPTP_CONN * conn) ++{ ++ return conn->conn_state == CONN_DEAD; ++} ++ ++void pptp_conn_free(PPTP_CONN * conn) ++{ + free(conn); + } + +@@ -1038,11 +1059,13 @@ + int i; + /* "Keep Alives and Timers, 1": check connection state */ + if (global.conn->conn_state != CONN_ESTABLISHED) { +- if (global.conn->conn_state == CONN_WAIT_STOP_REPLY) ++ if (global.conn->conn_state == CONN_WAIT_STOP_REPLY) { + /* hard close. */ + pptp_conn_destroy(global.conn); +- else /* soft close */ +- pptp_conn_close(global.conn, PPTP_STOP_NONE); ++ return; ++ } ++ /* soft close */ ++ pptp_conn_close(global.conn, PPTP_STOP_NONE); + } + /* "Keep Alives and Timers, 2": check echo status */ + if (global.conn->ka_state == KA_OUTSTANDING) { +--- a/pptp_ctrl.h 2008-05-14 07:33:55.000000000 +0100 ++++ b/pptp_ctrl.h 2010-06-15 14:32:00.864975405 +0100 +@@ -33,6 +33,8 @@ + void pptp_call_close(PPTP_CONN * conn, PPTP_CALL * call); + /* hard close. */ + void pptp_call_destroy(PPTP_CONN *conn, PPTP_CALL *call); ++int pptp_conn_is_dead(PPTP_CONN * conn); ++void pptp_conn_free(PPTP_CONN * conn); + /* soft close. Will callback on completion. */ + void pptp_conn_close(PPTP_CONN * conn, u_int8_t close_reason); + /* hard close */ diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch b/pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch new file mode 100644 index 0000000..78c021e --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-conn-free2.patch @@ -0,0 +1,83 @@ +Fri Jun 4 10:54:04 2010 Jan Just Keijser <jan.just.keijser(a)gmail.com> + + * pptp_ctrl.c: check for failure return by pptp_send_ctrl_packet + and avoid using freed struct conn. + +--- a/pptp_ctrl.c 2010-06-15 15:05:46.743913798 +0100 ++++ b/pptp_ctrl.c 2010-06-15 14:32:00.480100647 +0100 +@@ -396,9 +400,10 @@ + /* don't check state against WAIT_DISCONNECT... allow multiple disconnect + * requests to be made. + */ +- pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst)); +- pptp_reset_timer(); +- call->state.pns = PNS_WAIT_DISCONNECT; ++ if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) { ++ pptp_reset_timer(); ++ call->state.pns = PNS_WAIT_DISCONNECT; ++ } + /* call structure will be freed when we have confirmation of disconnect. */ + } + +@@ -431,9 +436,10 @@ + pptp_call_close(conn, vector_get_Nth(conn->call, i)); + /* now close connection */ + log("Closing PPTP connection"); +- pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst)); +- pptp_reset_timer(); /* wait 60 seconds for reply */ +- conn->conn_state = CONN_WAIT_STOP_REPLY; ++ if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) { ++ pptp_reset_timer(); /* wait 60 seconds for reply */ ++ conn->conn_state = CONN_WAIT_STOP_REPLY; ++ } + return; + } + +@@ -733,8 +739,8 @@ + reply.version = packet->version; + /* protocol version not supported */ + reply.result_code = hton8(5); +- pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); +- pptp_reset_timer(); /* give sender a chance for a retry */ ++ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) ++ pptp_reset_timer(); /* give sender a chance for a retry */ + } else { /* same or greater version */ + if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) { + conn->conn_state = CONN_ESTABLISHED; +@@ -841,8 +847,8 @@ + hton8(1), hton8(PPTP_GENERAL_ERROR_NONE), 0 + }; + logecho( PPTP_ECHO_RQST); +- pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); +- pptp_reset_timer(); ++ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) ++ pptp_reset_timer(); + break; + } + /* ----------- OUTGOING CALL MESSAGES ------------ */ +@@ -928,9 +935,10 @@ + vector_search(conn->call, ntoh16(packet->call_id), &call); + if (call->callback != NULL) + call->callback(conn, call, CALL_CLOSE_RQST); +- pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); +- pptp_call_destroy(conn, call); +- log("Call closed (RQST) (call id %d)", (int) call->call_id); ++ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) { ++ pptp_call_destroy(conn, call); ++ log("Call closed (RQST) (call id %d)", (int) call->call_id); ++ } + } + break; + } +@@ -1067,8 +1075,9 @@ + } else { /* ka_state == NONE */ /* send keep-alive */ + struct pptp_echo_rqst rqst = { + PPTP_HEADER_CTRL(PPTP_ECHO_RQST), hton32(global.conn->ka_id) }; +- pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst)); +- global.conn->ka_state = KA_OUTSTANDING; ++ if (pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst))) { ++ global.conn->ka_state = KA_OUTSTANDING; ++ } + } + /* check incoming/outgoing call states for !IDLE && !ESTABLISHED */ + for (i = 0; i < vector_size(global.conn->call); i++) { diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch b/pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch new file mode 100644 index 0000000..c65cb32 --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-ip-path.patch @@ -0,0 +1,186 @@ +Index: routing.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v +retrieving revision 1.1 +diff -u -r1.1 routing.c +--- a/routing.c 2 Aug 2006 07:07:37 -0000 1.1 ++++ b/routing.c 25 Mar 2009 13:58:28 -0000 +@@ -23,9 +23,26 @@ + #include <stdio.h> + #include <string.h> + #include "routing.h" ++#include "config.h" + ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <arpa/inet.h> ++#include <errno.h> ++#include "util.h" ++/* PF_ROUTE socket*/ ++int rts; ++/* Destination and gateway addresses */ ++struct sockaddr_in rdst, rgw; ++/* Request sequence */ ++int rseq; ++int dorouting; ++#else /* Solaris */ + /* route to the server */ + char *route; ++#endif /* Solaris */ + + /* + +@@ -54,26 +71,113 @@ + */ + + void routing_init(char *ip) { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ rdst.sin_family = AF_INET; ++ if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) { ++ log("Cannot convert address: %s", strerror(errno)); ++ return; ++ } ++ ++ if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) { ++ log("Cannot open routing socket: %s", strerror(errno)); ++ return; ++ } ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_GET, ++ .hdr.rtm_addrs = RTA_DST, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error writing to routing socket: %s", strerror(errno)); ++ close(rts); ++ return; ++ } ++ ++ while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 ) ++ if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) { ++ /* Check if host route already present */ ++ if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) { ++ rgw = rtm.addrs[RTAX_GATEWAY]; ++ dorouting = 1; ++ } ++ break; ++ } ++#else /* Solaris */ + char buf[256]; +- snprintf(buf, 255, "/bin/ip route get %s", ip); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); ++ p = popen(buf, "r"); + fgets(buf, 255, p); + /* TODO: check for failure of fgets */ + route = strdup(buf); + pclose(p); + /* TODO: check for failure of command */ ++#endif /* Solaris */ + } + + void routing_start() { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ if ( ! dorouting ) ++ return; ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_ADD, ++ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, ++ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst, ++ .addrs[RTAX_GATEWAY] = rgw ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error adding route: %s", strerror(errno)); ++ } ++#else /* Solaris */ + char buf[256]; +- snprintf(buf, 255, "/bin/ip route replace %s", route); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); ++ p = popen(buf, "r"); + pclose(p); ++#endif /* Solaris */ + } + + void routing_end() { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ if ( ! dorouting) ++ return; ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_DELETE, ++ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, ++ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst, ++ .addrs[RTAX_GATEWAY] = rgw ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error deleting route: %s", strerror(errno)); ++ } ++#else /* Solaris */ + char buf[256]; +- snprintf(buf, 255, "/bin/ip route delete %s", route); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); ++ p = popen(buf, "r"); + pclose(p); ++#endif /* Solaris */ + } +Index: Makefile +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v +retrieving revision 1.47 +retrieving revision 1.49 +diff -u -r1.47 -r1.49 +--- a/Makefile 14 May 2008 06:32:52 -0000 1.47 ++++ b/Makefile 24 Jul 2008 05:37:47 -0000 1.49 +@@ -1,10 +1,13 @@ +-# $Id: Makefile,v 1.47 2008/05/14 06:32:52 quozl Exp $ ++# $Id: Makefile,v 1.49 2008/07/24 05:37:47 quozl Exp $ + VERSION=1.7.2 + RELEASE= + + ################################################################# +-# CHANGE THIS LINE to point to the location of your pppd binary. ++# CHANGE THIS LINE to point to the location of binaries + PPPD = /usr/sbin/pppd ++# Solaris ++# PPPD = /usr/bin/pppd ++IP = /bin/ip + ################################################################# + + BINDIR=$(DESTDIR)/usr/sbin +@@ -47,6 +52,7 @@ + echo "/* text added by Makefile target config.h */" > config.h + echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h + echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h ++ echo "#define IP_BINARY \"$(IP)\"" >> config.h + + vector_test: vector_test.o vector.o + $(CC) -o vector_test vector_test.o vector.o diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch b/pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch new file mode 100644 index 0000000..02b36cf --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-makedeps.patch @@ -0,0 +1,80 @@ +Index: Makefile +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v +retrieving revision 1.47 +retrieving revision 1.49 +diff -u -r1.47 -r1.49 +--- a/Makefile 14 May 2008 06:32:52 -0000 1.47 ++++ b/Makefile 24 Jul 2008 05:37:47 -0000 1.49 +@@ -96,3 +102,71 @@ + release: + cp pptp_$(VERSION)-0_i386.deb $(WEB) + cd $(WEB);make ++ ++# The following include file dependencies were generated using ++# "makedepend -w0 *.c", then manually removing out of tree entries. ++# DO NOT DELETE ++ ++dirutil.o: dirutil.h ++orckit_quirks.o: pptp_msg.h ++orckit_quirks.o: pptp_compat.h ++orckit_quirks.o: pptp_options.h ++orckit_quirks.o: pptp_ctrl.h ++orckit_quirks.o: util.h ++ppp_fcs.o: ppp_fcs.h ++ppp_fcs.o: pptp_compat.h ++pptp.o: config.h ++pptp.o: pptp_callmgr.h ++pptp.o: pptp_gre.h ++pptp.o: pptp_compat.h ++pptp.o: version.h ++pptp.o: inststr.h ++pptp.o: util.h ++pptp.o: pptp_quirks.h ++pptp.o: pptp_msg.h ++pptp.o: pptp_ctrl.h ++pptp.o: pqueue.h ++pptp.o: pptp_options.h ++pptp_callmgr.o: pptp_callmgr.h ++pptp_callmgr.o: pptp_ctrl.h ++pptp_callmgr.o: pptp_compat.h ++pptp_callmgr.o: pptp_msg.h ++pptp_callmgr.o: dirutil.h ++pptp_callmgr.o: vector.h ++pptp_callmgr.o: util.h ++pptp_callmgr.o: routing.h ++pptp_compat.o: pptp_compat.h ++pptp_compat.o: util.h ++pptp_ctrl.o: pptp_msg.h ++pptp_ctrl.o: pptp_compat.h ++pptp_ctrl.o: pptp_ctrl.h ++pptp_ctrl.o: pptp_options.h ++pptp_ctrl.o: vector.h ++pptp_ctrl.o: util.h ++pptp_ctrl.o: pptp_quirks.h ++pptp_gre.o: ppp_fcs.h ++pptp_gre.o: pptp_compat.h ++pptp_gre.o: pptp_msg.h ++pptp_gre.o: pptp_gre.h ++pptp_gre.o: util.h ++pptp_gre.o: pqueue.h ++pptp_gre.o: test.h ++pptp_quirks.o: orckit_quirks.h ++pptp_quirks.o: pptp_options.h ++pptp_quirks.o: pptp_ctrl.h ++pptp_quirks.o: pptp_compat.h ++pptp_quirks.o: pptp_msg.h ++pptp_quirks.o: pptp_quirks.h ++pqueue.o: util.h ++pqueue.o: pqueue.h ++routing.o: routing.h ++test.o: util.h ++test.o: test.h ++util.o: util.h ++vector.o: pptp_ctrl.h ++vector.o: pptp_compat.h ++vector.o: vector.h ++vector_test.o: vector.h ++vector_test.o: pptp_ctrl.h ++vector_test.o: pptp_compat.h ++version.o: config.h diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch new file mode 100644 index 0000000..6f7bfa5 --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-encrypt.patch @@ -0,0 +1,22 @@ +--- a/pptpsetup 2009-06-01 14:30:36.000000000 +0100 ++++ b/pptpsetup 2009-06-01 14:36:39.000000000 +0100 +@@ -43,12 +43,13 @@ + sub create { + my $TUNNEL = shift; + +- # system checking +- &Check_MPPE_in_kernel +- or die "$0: couldn't find MPPE support in kernel.\n"; +- +- &Check_MPPE_in_pppd +- or die "$0: couldn't find MPPE support in pppd.\n"; ++ # if encryption is requested, check for support in kernel and pppd ++ if ( $ENCRYPT ) { ++ &Check_MPPE_in_kernel ++ or die "$0: couldn't find MPPE support in kernel.\n"; ++ &Check_MPPE_in_pppd ++ or die "$0: couldn't find MPPE support in pppd.\n"; ++ } + + # input validation + ($TUNNEL) = $TUNNEL =~ m{^(\w+)$} diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch new file mode 100644 index 0000000..c8668ea --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup-mppe.patch @@ -0,0 +1,47 @@ +--- pptp-1.7.2/pptpsetup 2009-06-01 15:18:25.000000000 +0100 ++++ pptp-1.7.2/pptpsetup 2009-06-01 15:19:25.000000000 +0100 +@@ -43,14 +43,6 @@ + sub create { + my $TUNNEL = shift; + +- # if encryption is requested, check for support in kernel and pppd +- if ( $ENCRYPT ) { +- &Check_MPPE_in_kernel +- or die "$0: couldn't find MPPE support in kernel.\n"; +- &Check_MPPE_in_pppd +- or die "$0: couldn't find MPPE support in pppd.\n"; +- } +- + # input validation + ($TUNNEL) = $TUNNEL =~ m{^(\w+)$} + or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n"; +@@ -180,29 +172,6 @@ + exit; + } + +-### AUXILIAR SUBS ### +- +-sub Check_MPPE_in_kernel { +- my $command = q/modprobe ppp-compress-18/; +- if (system( $command ) == 0) { +- # no error! +- return 1; +- } else { +- return 0; +- } +-} +- +-sub Check_MPPE_in_pppd { +- my $command = q/strings `which pppd`|grep -i mppe|wc --lines/; +- my $answer = `$command`; +- if ($answer > 0) { +- # ok! +- return 1; +- } else { +- return 0; +- } +-} +- + __END__ + + =head1 NAME diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch new file mode 100644 index 0000000..c1d0638 --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-pptpsetup.patch @@ -0,0 +1,23 @@ +Index: pptpsetup +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v +retrieving revision 1.4 +diff -u -r1.4 pptpsetup +--- a/pptpsetup 2 Aug 2006 07:02:47 -0000 1.4 ++++ b/pptpsetup 25 Mar 2009 13:41:37 -0000 +@@ -154,6 +154,7 @@ + + # delete entry from chap-secrets + my $chap_file = '/etc/ppp/chap-secrets'; ++ my $mode = (stat($chap_file))[2] & 07777; + + open( FILE, $chap_file ) + or die "$0: can't read '$chap_file': $!\n"; +@@ -171,6 +172,7 @@ + # write new chap-secrets + open( FILE, ">$chap_file" ) + or die "$0: can't write '$chap_file': $!\n"; ++ chmod $mode, $chap_file; + print FILE $new_chap; + close FILE; + diff --git a/pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch b/pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch new file mode 100644 index 0000000..ef042f1 --- /dev/null +++ b/pkgs/core/pptp/patches/pptp-1.7.2-waitpid.patch @@ -0,0 +1,16 @@ +Tue Jun 15 15:02:28 2010 James Cameron <quozl(a)us.netrek.org> + + * pptp.c (open_callmgr): fix usage of status returned by waitpid; + it must be wrapped by WEXITSTATUS to shift bits as required. + +--- a/pptp.c 2010-06-15 14:35:20.265852021 +0100 ++++ b/pptp.c 2010-06-15 14:32:00.478100392 +0100 +@@ -475,7 +475,7 @@ + } + default: /* parent */ + waitpid(pid, &status, 0); +- if (status!= 0) ++ if (WEXITSTATUS(status) != 0) + fatal("Call manager exited with error %d", status); + break; + } diff --git a/pkgs/core/pptp/pptp.nm b/pkgs/core/pptp/pptp.nm index 8519dd0..6582c1d 100644 --- a/pkgs/core/pptp/pptp.nm +++ b/pkgs/core/pptp/pptp.nm @@ -47,7 +47,8 @@ PKG_TARBALL = $(THISAPP).tar.gz define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i Makefile \ -e "s/install -o root -m 555 pptp/install -m 755 pptp/" \ - -e "s/^OPTIMIZE=.*/OPTIMIZE=$(CFLAGS)/" + -e "s/^OPTIMIZE=.*/OPTIMIZE=$(CFLAGS)/" \ + -e "s/^IP.*/IP=\/sbin\/ip/" endef define STAGE_BUILD diff --git a/pkgs/core/tunctl/tunctl.nm b/pkgs/core/tunctl/tunctl.nm new file mode 100644 index 0000000..d487dc0 --- /dev/null +++ b/pkgs/core/tunctl/tunctl.nm @@ -0,0 +1,60 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = tunctl +PKG_VER = 1.5 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Networking/Tools +PKG_URL = http://tunctl.sourceforge.net/ +PKG_LICENSE = GPL+ +PKG_SUMMARY = Create and remove virtual network interfaces. + +define PKG_DESCRIPTION + tunctl is a tool to set up and maintain persistent TUN/TAP network \ + interfaces, enabling user applications access to the wire side of a \ + virtual nework interface. Such interfaces is useful for connecting VPN \ + software, virtualization, emulation and a number of other similar \ + applications to the network stack. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +# XXX needs docbook for man page + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -e "s/^CFLAGS.*/CFLAGS = $(CFLAGS)/" -i Makefile +endef + +define STAGE_BUILD + cd $(DIR_APP) && make tunctl CC=gcc +endef + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/usr/sbin + cd $(DIR_APP) && install -m 755 tunctl $(BUILDROOT)/usr/sbin +endef diff --git a/pkgs/core/udev/udev.nm b/pkgs/core/udev/udev.nm index c056a38..5e0e2d4 100644 --- a/pkgs/core/udev/udev.nm +++ b/pkgs/core/udev/udev.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = udev -PKG_VER = 157 +PKG_VER = 160 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/toolchain/coreutils/coreutils.nm b/pkgs/toolchain/coreutils/coreutils.nm index d813b86..8d5e6c2 100644 --- a/pkgs/toolchain/coreutils/coreutils.nm +++ b/pkgs/toolchain/coreutils/coreutils.nm @@ -3,6 +3,8 @@ PKG_TOOLCHAIN_DEPS += acl attr gcc glibc ncurses include ../../core/coreutils/coreutils.nm +STAGE_PREPARE_CMDS = # We need to autoreconf here + define STAGE_BUILD cd $(DIR_APP) && \ gl_cv_func_printf_directive_n=no \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d4afb2f1746cc16687919713deac33e6ffcfcc64
by git＠ipfire.org 02 Aug '10

02 Aug '10

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, master has been updated via d4afb2f1746cc16687919713deac33e6ffcfcc64 (commit) via 38fb6b4f219973ac5b54bc8a022005a8b504f7fa (commit) from ba801eb10cd94a9c25d409b9596200d91fa94c5a (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 d4afb2f1746cc16687919713deac33e6ffcfcc64 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 10:57:44 2010 +0200 core40: Add dhcp customization feature. commit 38fb6b4f219973ac5b54bc8a022005a8b504f7fa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 10:56:45 2010 +0200 core40: Add dnsmasq customization feature. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/40/filelists/files | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/40/filelists/files b/config/rootfiles/core/40/filelists/files index 3819798..34fb931 100644 --- a/config/rootfiles/core/40/filelists/files +++ b/config/rootfiles/core/40/filelists/files @@ -4,7 +4,9 @@ var/ipfire/langs/de.pl var/ipfire/langs/es.pl var/ipfire/langs/fr.pl var/ipfire/dhcp/dhcpd.conf.local +etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/functions +srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/time.cgi usr/lib/python2.7/ipaddr.pyc usr/lib/python2.7/site-packages/drv_libxml2.py hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. ba801eb10cd94a9c25d409b9596200d91fa94c5a
by git＠ipfire.org 01 Aug '10

01 Aug '10

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, master has been updated via ba801eb10cd94a9c25d409b9596200d91fa94c5a (commit) via 378c20769d13dd890f804d765c562c2f3b05995c (commit) from 50a84cd283d64dd1573611c8a57fd659e6cfb47f (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 ba801eb10cd94a9c25d409b9596200d91fa94c5a Merge: 50a84cd 378c207 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 1 22:00:37 2010 +0200 Merge branch 'reiser4' commit 378c20769d13dd890f804d765c562c2f3b05995c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 1 15:15:51 2010 +0200 Remove reiser4progs from installer system. The installer does not support installation on reiser4 any more. ----------------------------------------------------------------------- Summary of changes: lfs/libaal | 12 +----------- lfs/reiser4progs | 16 +--------------- make.sh | 2 -- 3 files changed, 2 insertions(+), 28 deletions(-) Difference in files: diff --git a/lfs/libaal b/lfs/libaal index 99ede17..08d8ac1 100644 --- a/lfs/libaal +++ b/lfs/libaal @@ -30,11 +30,7 @@ THISAPP = libaal-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(LFS_PASS)" "install" - TARGET = $(DIR_INFO)/$(THISAPP)-install -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -74,14 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(LFS_PASS)" "install" - cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install -else cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 92a9338..99cbb84 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -30,11 +30,7 @@ THISAPP = reiser4progs-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(LFS_PASS)" "install" - TARGET = $(DIR_INFO)/$(THISAPP)-install -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -74,18 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -ifeq "$(LFS_PASS)" "install" - cd $(DIR_APP) && ./configure --prefix=/opt/$(MACHINE)-uClibc \ - --with-libaal=/opt/$(MACHINE)-uClibc \ - --without-readline --disable-shared \ - --sbindir=/install/initrd/sbin - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - -rm -f /install/initrd/{debugfs.,measurefs.,make_}reiser4 -else cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin --enable-static cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install -endif @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/make.sh b/make.sh index 15b049e..a7cda09 100755 --- a/make.sh +++ b/make.sh @@ -682,8 +682,6 @@ buildinstaller() { installmake popt installmake sysvinit installmake misc-progs - installmake libaal - installmake reiser4progs installmake reiserfsprogs installmake sysfsutils installmake util-linux hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 50a84cd283d64dd1573611c8a57fd659e6cfb47f
by git＠ipfire.org 01 Aug '10

01 Aug '10

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, master has been updated via 50a84cd283d64dd1573611c8a57fd659e6cfb47f (commit) from a63fbb6d67851e989e44240f60126c083ec91686 (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 50a84cd283d64dd1573611c8a57fd659e6cfb47f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 19:19:50 2010 +0200 ipfireseeder: core39 part2. ----------------------------------------------------------------------- Summary of changes: lfs/ipfireseeder | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 6f1af88..3d1a32f 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,7 +27,7 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.7.i586-full-core38.iso.torrent +DL_FILE = ipfire-2.7.i586-full-core39.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. a63fbb6d67851e989e44240f60126c083ec91686
by git＠ipfire.org 01 Aug '10

01 Aug '10

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, master has been updated via a63fbb6d67851e989e44240f60126c083ec91686 (commit) via 33e502304f75fcc7ab814a3b7cb1ac2e18da4c5b (commit) from 16a61778633c7924fd60bb6f1fd7d51b717fe4ef (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 a63fbb6d67851e989e44240f60126c083ec91686 Merge: 33e5023 16a6177 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 19:08:29 2010 +0200 Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x commit 33e502304f75fcc7ab814a3b7cb1ac2e18da4c5b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 19:07:46 2010 +0200 ipfireseeder: update for core39. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index f38ed4e..64898be 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.7.i586-full-core38.iso.torrent +var/ipfire/seeder/ipfire-2.7.i586-full-core39.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 4477762..6f1af88 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 12 +PAK_VER = 13 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0848aee5e93b9716ce70f6dcdf2f5863 +$(DL_FILE)_MD5 = fb86055370d1cd5c0736c47b3e4f68f6 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 21d7908cf365228d3facd0c2b83c49a3fb05a641
by git＠ipfire.org 01 Aug '10

01 Aug '10

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 21d7908cf365228d3facd0c2b83c49a3fb05a641 (commit) via 50373f360ca45d4b2489e9441a4e3d38ffed8730 (commit) via ee8a12b6998e7b169b61bf2148386ba4fa9990bb (commit) from dafc8fbea2ce4313a48938ba9a94718dfc59db3b (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 21d7908cf365228d3facd0c2b83c49a3fb05a641 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 19:01:08 2010 +0200 Disabled core38 and 39 build. commit 50373f360ca45d4b2489e9441a4e3d38ffed8730 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 19:00:27 2010 +0200 xen-image: use dracut to build initrd. commit ee8a12b6998e7b169b61bf2148386ba4fa9990bb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 1 18:59:38 2010 +0200 nut: remove patch that convert udev rules to old format. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/40/filelists/mkinitcpio | 1 - config/rootfiles/{core => oldcore}/38/exclude | 0 .../{core => oldcore}/38/filelists/Net_SSLeay | 0 .../{core => oldcore}/38/filelists/collectd | 0 .../{core => oldcore}/38/filelists/compat-wireless | 0 .../{core => oldcore}/38/filelists/dosfstools | 0 .../{core => oldcore}/38/filelists/e2fsprogs | 0 .../rootfiles/{core => oldcore}/38/filelists/files | 0 .../rootfiles/{core => oldcore}/38/filelists/fuse | 0 .../rootfiles/{core => oldcore}/38/filelists/grub | 0 .../{core => oldcore}/38/filelists/iptables | 0 .../{core => oldcore}/38/filelists/liboping | 0 .../rootfiles/{core => oldcore}/38/filelists/linux | 0 .../{core => oldcore}/38/filelists/linux-firmware | 0 .../rootfiles/{core => oldcore}/38/filelists/mISDN | 0 .../{core => oldcore}/38/filelists/mISDNuser | 0 .../rootfiles/{core => oldcore}/38/filelists/menu | 0 .../{core => oldcore}/38/filelists/mkinitcpio | 0 .../{core => oldcore}/38/filelists/openssh | 0 .../{core => oldcore}/38/filelists/openssl | 0 .../rootfiles/{core => oldcore}/38/filelists/pcre | 0 .../{core => oldcore}/38/filelists/reiser4progs | 0 .../{core => oldcore}/38/filelists/reiserfsprogs | 0 .../{core => oldcore}/38/filelists/rrdtool | 0 .../{core => oldcore}/38/filelists/smartmontools | 0 .../rootfiles/{core => oldcore}/38/filelists/snort | 0 .../{core => oldcore}/38/filelists/strongswan | 0 .../{core => oldcore}/38/filelists/usb_modeswitch | 0 config/rootfiles/{core => oldcore}/38/filelists/xz | 0 .../rootfiles/{core => oldcore}/38/filelists/zlib | 0 config/rootfiles/{core => oldcore}/38/meta | 0 config/rootfiles/{core => oldcore}/38/update.sh | 0 config/rootfiles/{core => oldcore}/39/exclude | 0 .../rootfiles/{core => oldcore}/39/filelists/files | 0 .../{core => oldcore}/39/filelists/libevent | 0 .../{core => oldcore}/39/filelists/libpng | 0 .../rootfiles/{core => oldcore}/39/filelists/ppp | 0 .../{core => oldcore}/39/filelists/strongswan | 0 .../{core => oldcore}/39/filelists/terminfo-screen | 0 config/rootfiles/{core => oldcore}/39/meta | 0 config/rootfiles/{core => oldcore}/39/update.sh | 0 doc/packages-list.txt | 8 +++----- lfs/nut | 4 ++-- lfs/xen-image | 5 +---- 44 files changed, 6 insertions(+), 12 deletions(-) delete mode 120000 config/rootfiles/core/40/filelists/mkinitcpio rename config/rootfiles/{core => oldcore}/38/exclude (100%) rename config/rootfiles/{core => oldcore}/38/filelists/Net_SSLeay (100%) rename config/rootfiles/{core => oldcore}/38/filelists/collectd (100%) rename config/rootfiles/{core => oldcore}/38/filelists/compat-wireless (100%) rename config/rootfiles/{core => oldcore}/38/filelists/dosfstools (100%) rename config/rootfiles/{core => oldcore}/38/filelists/e2fsprogs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/files (100%) rename config/rootfiles/{core => oldcore}/38/filelists/fuse (100%) rename config/rootfiles/{core => oldcore}/38/filelists/grub (100%) rename config/rootfiles/{core => oldcore}/38/filelists/iptables (100%) rename config/rootfiles/{core => oldcore}/38/filelists/liboping (100%) rename config/rootfiles/{core => oldcore}/38/filelists/linux (100%) rename config/rootfiles/{core => oldcore}/38/filelists/linux-firmware (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mISDN (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mISDNuser (100%) rename config/rootfiles/{core => oldcore}/38/filelists/menu (100%) rename config/rootfiles/{core => oldcore}/38/filelists/mkinitcpio (100%) rename config/rootfiles/{core => oldcore}/38/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/38/filelists/openssl (100%) rename config/rootfiles/{core => oldcore}/38/filelists/pcre (100%) rename config/rootfiles/{core => oldcore}/38/filelists/reiser4progs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/reiserfsprogs (100%) rename config/rootfiles/{core => oldcore}/38/filelists/rrdtool (100%) rename config/rootfiles/{core => oldcore}/38/filelists/smartmontools (100%) rename config/rootfiles/{core => oldcore}/38/filelists/snort (100%) rename config/rootfiles/{core => oldcore}/38/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/38/filelists/usb_modeswitch (100%) rename config/rootfiles/{core => oldcore}/38/filelists/xz (100%) rename config/rootfiles/{core => oldcore}/38/filelists/zlib (100%) rename config/rootfiles/{core => oldcore}/38/meta (100%) rename config/rootfiles/{core => oldcore}/38/update.sh (100%) rename config/rootfiles/{core => oldcore}/39/exclude (100%) rename config/rootfiles/{core => oldcore}/39/filelists/files (100%) rename config/rootfiles/{core => oldcore}/39/filelists/libevent (100%) rename config/rootfiles/{core => oldcore}/39/filelists/libpng (100%) rename config/rootfiles/{core => oldcore}/39/filelists/ppp (100%) rename config/rootfiles/{core => oldcore}/39/filelists/strongswan (100%) rename config/rootfiles/{core => oldcore}/39/filelists/terminfo-screen (100%) rename config/rootfiles/{core => oldcore}/39/meta (100%) rename config/rootfiles/{core => oldcore}/39/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/38/exclude b/config/rootfiles/core/38/exclude deleted file mode 100644 index e69de29..0000000 diff --git a/config/rootfiles/core/38/filelists/Net_SSLeay b/config/rootfiles/core/38/filelists/Net_SSLeay deleted file mode 120000 index 13fe056..0000000 --- a/config/rootfiles/core/38/filelists/Net_SSLeay +++ /dev/null @@ -1 +0,0 @@ -../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/collectd b/config/rootfiles/core/38/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/38/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/compat-wireless b/config/rootfiles/core/38/filelists/compat-wireless deleted file mode 120000 index 5b5ac9e..0000000 --- a/config/rootfiles/core/38/filelists/compat-wireless +++ /dev/null @@ -1 +0,0 @@ -../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/dosfstools b/config/rootfiles/core/38/filelists/dosfstools deleted file mode 120000 index 087ccb0..0000000 --- a/config/rootfiles/core/38/filelists/dosfstools +++ /dev/null @@ -1 +0,0 @@ -../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/e2fsprogs b/config/rootfiles/core/38/filelists/e2fsprogs deleted file mode 120000 index 37b55de..0000000 --- a/config/rootfiles/core/38/filelists/e2fsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/files b/config/rootfiles/core/38/filelists/files deleted file mode 100644 index c6e13b7..0000000 --- a/config/rootfiles/core/38/filelists/files +++ /dev/null @@ -1,169 +0,0 @@ -etc/system-release -etc/issue -etc/e2fsck.conf -etc/httpd/conf/vhosts.d/ipfire-interface.conf -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/rc.d/init.d/leds -etc/rc.d/init.d/rc -etc/rc.d/init.d/snort -etc/rc.d/init.d/networking/red.up/50-ovpn -etc/rc.d/init.d/networking/dhcpcd.exe -etc/rc.d/rc0.d/K78snort -etc/rc.d/rc0.d/K79leds -etc/rc.d/rc3.d/S21leds -etc/rc.d/rc6.d/K78snort -etc/rc.d/rc6.d/K79leds -etc/udev/rules.d/52-nut-usbups.rules -etc/udev/rules.d/xpp.rules -var/ipfire/backup/bin/backup.pl -var/ipfire/header.pl -var/ipfire/menu.d/50-firewall.menu -var/ipfire/outgoing/bin/outgoingfw.pl -var/ipfire/graphs.pl -var/ipfire/general-functions.pl -etc/modprobe.d/cfg80211 -etc/modprobe.d/pcspeaker -var/ipfire/qos/bin/makeqosscripts.pl -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/iptables.cgi -srv/web/ipfire/cgi-bin/logs.cgi/config.dat -srv/web/ipfire/cgi-bin/netother.cgi -srv/web/ipfire/cgi-bin/outgoingfw.cgi -srv/web/ipfire/cgi-bin/outgoinggrp.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/time.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/cgi-bin/wireless.cgi -srv/web/ipfire/html/themes/ipfire/include/functions.pl -srv/web/ipfire/html/themes/maniac/include/functions.pl -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl -var/ipfire/langs/list -var/ipfire/main/disable_nf_sip -var/ipfire/outgoing/groups -etc/rc.d/init.d/firewall -etc/rc.d/init.d/ipsec -etc/rc.d/init.d/network -etc/rc.d/init.d/ntp -etc/rc.d/init.d/modules -usr/local/bin/ipsecctrl -usr/local/bin/rebuildhosts -usr/local/bin/syslogdctrl -usr/local/bin/wirelessctrl -usr/local/sbin/setup -usr/sbin/openvpn -opt/pakfire/lib/functions.sh -usr/local/share/GeoIP/GeoIP.dat -usr/share/hwdata/pci.ids -usr/share/hwdata/usb.ids -usr/bin/squidGuard -usr/sbin/redirect_wrapper -var/lib/squidguard -var/urlrepo -usr/sbin/klogd -usr/sbin/syslogd -etc/squid/cachemgr.conf -etc/squid/errors -etc/squid/mime.conf -etc/squid/msntauth.conf -etc/squid/squid.conf -srv/web/ipfire/cgi-bin/cachemgr.cgi -usr/bin/squidclient -usr/lib/squid/auth -usr/lib/squid/diskd-daemon -usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD -usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL -usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL -usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED -usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED -usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE -usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN -usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR -usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED -usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE -usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ -usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP -usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL -usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP -usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY -usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS -usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR -usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT -usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN -usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE -usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG -usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ -usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE -usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR -usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED -usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD -usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL -usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL -usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED -usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED -usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE -usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN -usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR -usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED -usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE -usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ -usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP -usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL -usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP -usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY -usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS -usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR -usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT -usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN -usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE -usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG -usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ -usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE -usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR -usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT -usr/lib/squid/errors/English -usr/lib/squid/errors/German -usr/lib/squid/icons -usr/lib/squid/logfile-daemon -usr/lib/squid/mib.txt -usr/lib/squid/msnt_auth -usr/lib/squid/ncsa_auth -usr/lib/squid/ntlm_auth -usr/lib/squid/smb_auth -usr/lib/squid/smb_auth.pl -usr/lib/squid/smb_auth.sh -usr/lib/squid/squid_ldap_auth -usr/lib/squid/unlinkd -usr/sbin/squid -usr/sbin/updxlrator -var/ipfire/updatexlrator/autocheck/cron.daily -var/ipfire/updatexlrator/autocheck/cron.monthly -var/ipfire/updatexlrator/autocheck/cron.weekly -var/ipfire/updatexlrator/bin/checkdeaddl -var/ipfire/updatexlrator/bin/checkup -var/ipfire/updatexlrator/bin/convert -var/ipfire/updatexlrator/bin/download -var/ipfire/updatexlrator/bin/lscache -var/ipfire/updatexlrator/updxlrator-lib.pl -var/log/cache -var/log/updatexlrator -usr/local/bin/vpn-watch -srv/web/ipfire/html/images/go-down.png diff --git a/config/rootfiles/core/38/filelists/fuse b/config/rootfiles/core/38/filelists/fuse deleted file mode 120000 index 570edaa..0000000 --- a/config/rootfiles/core/38/filelists/fuse +++ /dev/null @@ -1 +0,0 @@ -../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/grub b/config/rootfiles/core/38/filelists/grub deleted file mode 120000 index 050745c..0000000 --- a/config/rootfiles/core/38/filelists/grub +++ /dev/null @@ -1 +0,0 @@ -../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/iptables b/config/rootfiles/core/38/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/38/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/liboping b/config/rootfiles/core/38/filelists/liboping deleted file mode 120000 index 3ae1904..0000000 --- a/config/rootfiles/core/38/filelists/liboping +++ /dev/null @@ -1 +0,0 @@ -../../../common/liboping \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux b/config/rootfiles/core/38/filelists/linux deleted file mode 120000 index c469fe1..0000000 --- a/config/rootfiles/core/38/filelists/linux +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/linux-firmware b/config/rootfiles/core/38/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/38/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDN b/config/rootfiles/core/38/filelists/mISDN deleted file mode 120000 index 5707154..0000000 --- a/config/rootfiles/core/38/filelists/mISDN +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDN \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/mISDNuser b/config/rootfiles/core/38/filelists/mISDNuser deleted file mode 120000 index 78537d4..0000000 --- a/config/rootfiles/core/38/filelists/mISDNuser +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/menu b/config/rootfiles/core/38/filelists/menu deleted file mode 100644 index 0c629b0..0000000 --- a/config/rootfiles/core/38/filelists/menu +++ /dev/null @@ -1,8 +0,0 @@ -var/ipfire/menu.d/00-menu.main -var/ipfire/menu.d/10-system.menu -var/ipfire/menu.d/20-status.menu -var/ipfire/menu.d/30-network.menu -var/ipfire/menu.d/40-services.menu -var/ipfire/menu.d/50-firewall.menu -var/ipfire/menu.d/60-ipfire.menu -var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/core/38/filelists/mkinitcpio b/config/rootfiles/core/38/filelists/mkinitcpio deleted file mode 120000 index f9b3fde..0000000 --- a/config/rootfiles/core/38/filelists/mkinitcpio +++ /dev/null @@ -1 +0,0 @@ -../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssh b/config/rootfiles/core/38/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/38/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/openssl b/config/rootfiles/core/38/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/38/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/pcre b/config/rootfiles/core/38/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/38/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/reiser4progs b/config/rootfiles/core/38/filelists/reiser4progs deleted file mode 120000 index f5ea556..0000000 --- a/config/rootfiles/core/38/filelists/reiser4progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiser4progs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/reiserfsprogs b/config/rootfiles/core/38/filelists/reiserfsprogs deleted file mode 120000 index 008c3e8..0000000 --- a/config/rootfiles/core/38/filelists/reiserfsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/rrdtool b/config/rootfiles/core/38/filelists/rrdtool deleted file mode 120000 index 7a82e41..0000000 --- a/config/rootfiles/core/38/filelists/rrdtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/smartmontools b/config/rootfiles/core/38/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/38/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/snort b/config/rootfiles/core/38/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/38/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/strongswan b/config/rootfiles/core/38/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/38/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/usb_modeswitch b/config/rootfiles/core/38/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/38/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/xz b/config/rootfiles/core/38/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/38/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/zlib b/config/rootfiles/core/38/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/38/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/38/meta b/config/rootfiles/core/38/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/38/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh deleted file mode 100644 index dc643fe..0000000 --- a/config/rootfiles/core/38/update.sh +++ /dev/null @@ -1,277 +0,0 @@ -#!/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) 2010 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# -OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` -# -# Test if we running on xen -# -uname -r | grep "ipfire-xen"; -if [ ${?} = 0 ]; then - #Xen Kernel is active - NEWVERSION="2.7-xen" -else - #Normal Kernel - NEWVERSION="2.7" -fi -# -KVER="2.6.32.15" -ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -echo lib/modules >> /opt/pakfire/tmp/ROOTFILES -echo boot >> /opt/pakfire/tmp/ROOTFILES -echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES -echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES -echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES -# exclude squid cache from backup -sed -i -e "s|^var/log/cache|#var/log/cache|g" /opt/pakfire/tmp/ROOTFILES -# Backup the files -tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 - -# -# Stop Sevices -# -/etc/init.d/collectd stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop -/etc/init.d/snort stop - -echo -echo Update Kernel to $KVER ... -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire -# Don't remove all old xen modules. Kernel may stored outside. -# only from 2.6.27.25 and 31 -rm -rf /lib/modules/2.6.27.25-ipfire-xen -rm -rf /lib/modules/2.6.27.31-ipfire-xen -# -# remove openswan libs ... -# -rm -rf /usr/lib/ipsec -rm -rf /usr/libexec/ipsec -# -# old snort libs and rules ... -# -rm -rf /usr/lib/snort_* -rm -rf /etc/snort -# -# mISDN Files that was moved to sbin -# -rm -rf /usr/bin/misdn_rename -rm -rf /usr/bin/misdn_cleanl2 -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org -# -# Stop sysklogd -/etc/init.d/sysklogd stop -# -# Unpack the updated files -# -echo -echo Unpack the updated files ... -# -tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ - --no-overwrite-dir -# -# Start sysklogd -/etc/init.d/sysklogd start -# -# Modify grub.conf -# -echo -echo Update grub configuration ... -sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf -sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf -sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - -if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." -else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf -fi -# -# Made emergency - initramdisk -# -echo -echo Create new Initramdisks ... -cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org -sed -i "s| autodetect | |g" /etc/mkinitcpio.conf -mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img -cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf -# -# Made initramdisk -# -if [ "${ROOT:0:7}" == "/dev/sd" ]; then - # Remove ide hook if root is on sda - sed -i "s| ide | |g" /etc/mkinitcpio.conf -else -if [ "${ROOT:0:7}" == "/dev/hd" ]; then - # Remove pata & sata hook if root is on hda - sed -i "s| pata | |g" /etc/mkinitcpio.conf - sed -i "s| sata | |g" /etc/mkinitcpio.conf -fi -fi -mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck -# -# Rebuild Language -# -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# -# Cleanup Collectd statistics... -# -PRECLEAN=`du -sh /var/log/rrd/collectd` -# -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state* -rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm* -# -rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors* -rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets* -# -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged* -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops* -rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time* -# -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput* -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward* -rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW -POSTCLEAN=`du -sh /var/log/rrd/collectd` -# -echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. -# -# Start collectd -/etc/init.d/collectd start -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors -# -# USB Modeswitch conf now called setup, rename ... -# -if [ -e /etc/usb_modeswitch.conf ]; then -mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup -fi -# -# rebuild qosscript if enabled... -if [ -e /var/ipfire/qos/enable ]; then - /usr/local/bin/qosctrl stop - /usr/local/bin/qosctrl generate - /usr/local/bin/qosctrl start -fi -# -# -# convert ipsec.conf from openswan to strongswan... -mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org -cat /var/ipfire/vpn/ipsec.conf.org | \ -grep -v "disablearrivalcheck=" | \ -grep -v "klipsdebug=" | \ -grep -v "leftfirewall=" | \ -grep -v "lefthostaccess=" | \ -grep -v "charonstart=" | \ -grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf -sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf -sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes\n\tlefthostaccess=yes|g" /var/ipfire/vpn/ipsec.conf -sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf -chown nobody:nobody /var/ipfire/vpn/ipsec.conf -chmod 644 /var/ipfire/vpn/ipsec.conf -# -# Add cryptodev to /etc/sysconfig/modules -mv /etc/sysconfig/modules /etc/sysconfig/modules.org -cat /etc/sysconfig/modules.org | \ -grep -v "cryptodev" | \ -grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules -echo "" >> /etc/sysconfig/modules -echo "### cryptodev" >> /etc/sysconfig/modules -echo "#" >> /etc/sysconfig/modules -echo "cryptodev" >> /etc/sysconfig/modules -echo "" >> /etc/sysconfig/modules -echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules -chmod 644 /etc/sysconfig/modules -# Change version of Pakfire.conf -# -sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update -# -chmod +x /tmp/pak_update -/tmp/pak_update & -# -# Start squid -/etc/init.d/squid start -# -echo -echo Please wait until pakfire has ended... -echo diff --git a/config/rootfiles/core/39/exclude b/config/rootfiles/core/39/exclude deleted file mode 100644 index 778cdf7..0000000 --- a/config/rootfiles/core/39/exclude +++ /dev/null @@ -1,2 +0,0 @@ -etc/ppp/chap-secrets -etc/ppp/pap-secrets diff --git a/config/rootfiles/core/39/filelists/files b/config/rootfiles/core/39/filelists/files deleted file mode 100644 index b83814e..0000000 --- a/config/rootfiles/core/39/filelists/files +++ /dev/null @@ -1,17 +0,0 @@ -etc/system-release -etc/rc.d/init.d/dnsmasq -etc/rc.d/init.d/networking/red -etc/rc.d/helper/getdnsfromdhcpc.pl -srv/web/ipfire/cgi-bin/pppsetup.cgi -usr/local/bin/backupiso -usr/local/bin/updxlratorctrl -usr/local/bin/urlfilterctrl -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -/opt/pakfire/lib/functions.pl -var/ipfire/langs/de.pl -var/ipfire/langs/en.pl -var/ipfire/langs/es.pl -var/ipfire/langs/fr.pl diff --git a/config/rootfiles/core/39/filelists/libevent b/config/rootfiles/core/39/filelists/libevent deleted file mode 120000 index 3bbbc1a..0000000 --- a/config/rootfiles/core/39/filelists/libevent +++ /dev/null @@ -1 +0,0 @@ -../../../common/libevent \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/libpng b/config/rootfiles/core/39/filelists/libpng deleted file mode 120000 index 8ef96e2..0000000 --- a/config/rootfiles/core/39/filelists/libpng +++ /dev/null @@ -1 +0,0 @@ -../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/ppp b/config/rootfiles/core/39/filelists/ppp deleted file mode 120000 index 4844a9b..0000000 --- a/config/rootfiles/core/39/filelists/ppp +++ /dev/null @@ -1 +0,0 @@ -../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/strongswan b/config/rootfiles/core/39/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/39/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/39/filelists/terminfo-screen b/config/rootfiles/core/39/filelists/terminfo-screen deleted file mode 100644 index 98962f5..0000000 --- a/config/rootfiles/core/39/filelists/terminfo-screen +++ /dev/null @@ -1,11 +0,0 @@ -usr/share/terminfo/s/screen -usr/share/terminfo/s/screen-bce -usr/share/terminfo/s/screen-s -usr/share/terminfo/s/screen-w -usr/share/terminfo/s/screen.linux -usr/share/terminfo/s/screen.teraterm -usr/share/terminfo/s/screen.xterm-new -usr/share/terminfo/s/screen.xterm-r6 -usr/share/terminfo/s/screen.xterm-xfree86 -usr/share/terminfo/s/screen2 -usr/share/terminfo/s/screen3 diff --git a/config/rootfiles/core/39/meta b/config/rootfiles/core/39/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/39/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/39/update.sh b/config/rootfiles/core/39/update.sh deleted file mode 100644 index a54f5b8..0000000 --- a/config/rootfiles/core/39/update.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/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) 2010 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -# Cleanup crontab -cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp -mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig -fcrontab -z - -# -#Stop services - -# -#Extract files -extract_files -# -#Start services - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# -#Finish -#Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/40/filelists/mkinitcpio b/config/rootfiles/core/40/filelists/mkinitcpio deleted file mode 120000 index f9b3fde..0000000 --- a/config/rootfiles/core/40/filelists/mkinitcpio +++ /dev/null @@ -1 +0,0 @@ -../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/exclude b/config/rootfiles/oldcore/38/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/oldcore/38/filelists/Net_SSLeay b/config/rootfiles/oldcore/38/filelists/Net_SSLeay new file mode 120000 index 0000000..13fe056 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/Net_SSLeay @@ -0,0 +1 @@ +../../../common/Net_SSLeay \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/collectd b/config/rootfiles/oldcore/38/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/compat-wireless b/config/rootfiles/oldcore/38/filelists/compat-wireless new file mode 120000 index 0000000..5b5ac9e --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/dosfstools b/config/rootfiles/oldcore/38/filelists/dosfstools new file mode 120000 index 0000000..087ccb0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/dosfstools @@ -0,0 +1 @@ +../../../common/dosfstools \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/e2fsprogs b/config/rootfiles/oldcore/38/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/files b/config/rootfiles/oldcore/38/filelists/files new file mode 100644 index 0000000..c6e13b7 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/files @@ -0,0 +1,169 @@ +etc/system-release +etc/issue +etc/e2fsck.conf +etc/httpd/conf/vhosts.d/ipfire-interface.conf +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/rc.d/init.d/leds +etc/rc.d/init.d/rc +etc/rc.d/init.d/snort +etc/rc.d/init.d/networking/red.up/50-ovpn +etc/rc.d/init.d/networking/dhcpcd.exe +etc/rc.d/rc0.d/K78snort +etc/rc.d/rc0.d/K79leds +etc/rc.d/rc3.d/S21leds +etc/rc.d/rc6.d/K78snort +etc/rc.d/rc6.d/K79leds +etc/udev/rules.d/52-nut-usbups.rules +etc/udev/rules.d/xpp.rules +var/ipfire/backup/bin/backup.pl +var/ipfire/header.pl +var/ipfire/menu.d/50-firewall.menu +var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/graphs.pl +var/ipfire/general-functions.pl +etc/modprobe.d/cfg80211 +etc/modprobe.d/pcspeaker +var/ipfire/qos/bin/makeqosscripts.pl +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi/config.dat +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/outgoingfw.cgi +srv/web/ipfire/cgi-bin/outgoinggrp.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/time.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/functions.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl +var/ipfire/langs/list +var/ipfire/main/disable_nf_sip +var/ipfire/outgoing/groups +etc/rc.d/init.d/firewall +etc/rc.d/init.d/ipsec +etc/rc.d/init.d/network +etc/rc.d/init.d/ntp +etc/rc.d/init.d/modules +usr/local/bin/ipsecctrl +usr/local/bin/rebuildhosts +usr/local/bin/syslogdctrl +usr/local/bin/wirelessctrl +usr/local/sbin/setup +usr/sbin/openvpn +opt/pakfire/lib/functions.sh +usr/local/share/GeoIP/GeoIP.dat +usr/share/hwdata/pci.ids +usr/share/hwdata/usb.ids +usr/bin/squidGuard +usr/sbin/redirect_wrapper +var/lib/squidguard +var/urlrepo +usr/sbin/klogd +usr/sbin/syslogd +etc/squid/cachemgr.conf +etc/squid/errors +etc/squid/mime.conf +etc/squid/msntauth.conf +etc/squid/squid.conf +srv/web/ipfire/cgi-bin/cachemgr.cgi +usr/bin/squidclient +usr/lib/squid/auth +usr/lib/squid/diskd-daemon +usr/lib/squid/errors.ipfire/English/ERR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/English/ERR_CANNOT_FORWARD +usr/lib/squid/errors.ipfire/English/ERR_CONNECT_FAIL +usr/lib/squid/errors.ipfire/English/ERR_DNS_FAIL +usr/lib/squid/errors.ipfire/English/ERR_FORWARDING_DENIED +usr/lib/squid/errors.ipfire/English/ERR_FTP_DISABLED +usr/lib/squid/errors.ipfire/English/ERR_FTP_FAILURE +usr/lib/squid/errors.ipfire/English/ERR_FTP_FORBIDDEN +usr/lib/squid/errors.ipfire/English/ERR_FTP_NOT_FOUND +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_CREATED +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_ERROR +usr/lib/squid/errors.ipfire/English/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors.ipfire/English/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors.ipfire/English/ERR_INVALID_REQ +usr/lib/squid/errors.ipfire/English/ERR_INVALID_RESP +usr/lib/squid/errors.ipfire/English/ERR_INVALID_URL +usr/lib/squid/errors.ipfire/English/ERR_LIFETIME_EXP +usr/lib/squid/errors.ipfire/English/ERR_NO_RELAY +usr/lib/squid/errors.ipfire/English/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors.ipfire/English/ERR_READ_ERROR +usr/lib/squid/errors.ipfire/English/ERR_READ_TIMEOUT +usr/lib/squid/errors.ipfire/English/ERR_SHUTTING_DOWN +usr/lib/squid/errors.ipfire/English/ERR_SOCKET_FAILURE +usr/lib/squid/errors.ipfire/English/ERR_TOO_BIG +usr/lib/squid/errors.ipfire/English/ERR_UNSUP_REQ +usr/lib/squid/errors.ipfire/English/ERR_URN_RESOLVE +usr/lib/squid/errors.ipfire/English/ERR_WRITE_ERROR +usr/lib/squid/errors.ipfire/English/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors.ipfire/German/ERR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CACHE_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CACHE_MGR_ACCESS_DENIED +usr/lib/squid/errors.ipfire/German/ERR_CANNOT_FORWARD +usr/lib/squid/errors.ipfire/German/ERR_CONNECT_FAIL +usr/lib/squid/errors.ipfire/German/ERR_DNS_FAIL +usr/lib/squid/errors.ipfire/German/ERR_FORWARDING_DENIED +usr/lib/squid/errors.ipfire/German/ERR_FTP_DISABLED +usr/lib/squid/errors.ipfire/German/ERR_FTP_FAILURE +usr/lib/squid/errors.ipfire/German/ERR_FTP_FORBIDDEN +usr/lib/squid/errors.ipfire/German/ERR_FTP_NOT_FOUND +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_CREATED +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_ERROR +usr/lib/squid/errors.ipfire/German/ERR_FTP_PUT_MODIFIED +usr/lib/squid/errors.ipfire/German/ERR_FTP_UNAVAILABLE +usr/lib/squid/errors.ipfire/German/ERR_INVALID_REQ +usr/lib/squid/errors.ipfire/German/ERR_INVALID_RESP +usr/lib/squid/errors.ipfire/German/ERR_INVALID_URL +usr/lib/squid/errors.ipfire/German/ERR_LIFETIME_EXP +usr/lib/squid/errors.ipfire/German/ERR_NO_RELAY +usr/lib/squid/errors.ipfire/German/ERR_ONLY_IF_CACHED_MISS +usr/lib/squid/errors.ipfire/German/ERR_READ_ERROR +usr/lib/squid/errors.ipfire/German/ERR_READ_TIMEOUT +usr/lib/squid/errors.ipfire/German/ERR_SHUTTING_DOWN +usr/lib/squid/errors.ipfire/German/ERR_SOCKET_FAILURE +usr/lib/squid/errors.ipfire/German/ERR_TOO_BIG +usr/lib/squid/errors.ipfire/German/ERR_UNSUP_REQ +usr/lib/squid/errors.ipfire/German/ERR_URN_RESOLVE +usr/lib/squid/errors.ipfire/German/ERR_WRITE_ERROR +usr/lib/squid/errors.ipfire/German/ERR_ZERO_SIZE_OBJECT +usr/lib/squid/errors/English +usr/lib/squid/errors/German +usr/lib/squid/icons +usr/lib/squid/logfile-daemon +usr/lib/squid/mib.txt +usr/lib/squid/msnt_auth +usr/lib/squid/ncsa_auth +usr/lib/squid/ntlm_auth +usr/lib/squid/smb_auth +usr/lib/squid/smb_auth.pl +usr/lib/squid/smb_auth.sh +usr/lib/squid/squid_ldap_auth +usr/lib/squid/unlinkd +usr/sbin/squid +usr/sbin/updxlrator +var/ipfire/updatexlrator/autocheck/cron.daily +var/ipfire/updatexlrator/autocheck/cron.monthly +var/ipfire/updatexlrator/autocheck/cron.weekly +var/ipfire/updatexlrator/bin/checkdeaddl +var/ipfire/updatexlrator/bin/checkup +var/ipfire/updatexlrator/bin/convert +var/ipfire/updatexlrator/bin/download +var/ipfire/updatexlrator/bin/lscache +var/ipfire/updatexlrator/updxlrator-lib.pl +var/log/cache +var/log/updatexlrator +usr/local/bin/vpn-watch +srv/web/ipfire/html/images/go-down.png diff --git a/config/rootfiles/oldcore/38/filelists/fuse b/config/rootfiles/oldcore/38/filelists/fuse new file mode 120000 index 0000000..570edaa --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/fuse @@ -0,0 +1 @@ +../../../common/fuse \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/grub b/config/rootfiles/oldcore/38/filelists/grub new file mode 120000 index 0000000..050745c --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/iptables b/config/rootfiles/oldcore/38/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/liboping b/config/rootfiles/oldcore/38/filelists/liboping new file mode 120000 index 0000000..3ae1904 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/liboping @@ -0,0 +1 @@ +../../../common/liboping \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/linux b/config/rootfiles/oldcore/38/filelists/linux new file mode 120000 index 0000000..c469fe1 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/linux-firmware b/config/rootfiles/oldcore/38/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/mISDN b/config/rootfiles/oldcore/38/filelists/mISDN new file mode 120000 index 0000000..5707154 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mISDN @@ -0,0 +1 @@ +../../../common/mISDN \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/mISDNuser b/config/rootfiles/oldcore/38/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/menu b/config/rootfiles/oldcore/38/filelists/menu new file mode 100644 index 0000000..0c629b0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/menu @@ -0,0 +1,8 @@ +var/ipfire/menu.d/00-menu.main +var/ipfire/menu.d/10-system.menu +var/ipfire/menu.d/20-status.menu +var/ipfire/menu.d/30-network.menu +var/ipfire/menu.d/40-services.menu +var/ipfire/menu.d/50-firewall.menu +var/ipfire/menu.d/60-ipfire.menu +var/ipfire/menu.d/70-log.menu diff --git a/config/rootfiles/oldcore/38/filelists/mkinitcpio b/config/rootfiles/oldcore/38/filelists/mkinitcpio new file mode 120000 index 0000000..f9b3fde --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/mkinitcpio @@ -0,0 +1 @@ +../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/openssh b/config/rootfiles/oldcore/38/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/openssl b/config/rootfiles/oldcore/38/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/pcre b/config/rootfiles/oldcore/38/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/reiser4progs b/config/rootfiles/oldcore/38/filelists/reiser4progs new file mode 120000 index 0000000..f5ea556 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/reiser4progs @@ -0,0 +1 @@ +../../../common/reiser4progs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/reiserfsprogs b/config/rootfiles/oldcore/38/filelists/reiserfsprogs new file mode 120000 index 0000000..008c3e8 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/rrdtool b/config/rootfiles/oldcore/38/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/smartmontools b/config/rootfiles/oldcore/38/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/snort b/config/rootfiles/oldcore/38/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/strongswan b/config/rootfiles/oldcore/38/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/usb_modeswitch b/config/rootfiles/oldcore/38/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/xz b/config/rootfiles/oldcore/38/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/filelists/zlib b/config/rootfiles/oldcore/38/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/oldcore/38/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/oldcore/38/meta b/config/rootfiles/oldcore/38/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/38/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/38/update.sh b/config/rootfiles/oldcore/38/update.sh new file mode 100644 index 0000000..dc643fe --- /dev/null +++ b/config/rootfiles/oldcore/38/update.sh @@ -0,0 +1,277 @@ +#!/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) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +# +# Test if we running on xen +# +uname -r | grep "ipfire-xen"; +if [ ${?} = 0 ]; then + #Xen Kernel is active + NEWVERSION="2.7-xen" +else + #Normal Kernel + NEWVERSION="2.7" +fi +# +KVER="2.6.32.15" +ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES +echo usr/lib/ipsec >> /opt/pakfire/tmp/ROOTFILES +echo usr/libexec/ipsec >> /opt/pakfire/tmp/ROOTFILES +# exclude squid cache from backup +sed -i -e "s|^var/log/cache|#var/log/cache|g" /opt/pakfire/tmp/ROOTFILES +# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +# +# Stop Sevices +# +/etc/init.d/collectd stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop +/etc/init.d/snort stop + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# Don't remove all old xen modules. Kernel may stored outside. +# only from 2.6.27.25 and 31 +rm -rf /lib/modules/2.6.27.25-ipfire-xen +rm -rf /lib/modules/2.6.27.31-ipfire-xen +# +# remove openswan libs ... +# +rm -rf /usr/lib/ipsec +rm -rf /usr/libexec/ipsec +# +# old snort libs and rules ... +# +rm -rf /usr/lib/snort_* +rm -rf /etc/snort +# +# mISDN Files that was moved to sbin +# +rm -rf /usr/bin/misdn_rename +rm -rf /usr/bin/misdn_cleanl2 +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Stop sysklogd +/etc/init.d/sysklogd stop +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir +# +# Start sysklogd +/etc/init.d/sysklogd start +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# Made emergency - initramdisk +# +echo +echo Create new Initramdisks ... +cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org +sed -i "s| autodetect | |g" /etc/mkinitcpio.conf +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img +cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf +# +# Made initramdisk +# +if [ "${ROOT:0:7}" == "/dev/sd" ]; then + # Remove ide hook if root is on sda + sed -i "s| ide | |g" /etc/mkinitcpio.conf +else +if [ "${ROOT:0:7}" == "/dev/hd" ]; then + # Remove pata & sata hook if root is on hda + sed -i "s| pata | |g" /etc/mkinitcpio.conf + sed -i "s| sata | |g" /etc/mkinitcpio.conf +fi +fi +mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Cleanup Collectd statistics... +# +PRECLEAN=`du -sh /var/log/rrd/collectd` +# +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_count* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_pagefaults* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_stacksize* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_state* +rm -rf /var/log/rrd*/collectd/localhost/processes-*/ps_vm* +# +rm -rf /var/log/rrd*/collectd/localhost/interface/if_errors* +rm -rf /var/log/rrd*/collectd/localhost/interface/if_packets* +# +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_merged* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_ops* +rm -rf /var/log/rrd*/collectd/localhost/disk-*/disk_time* +# +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-INPUT/*-DROP_Wirelessinput* +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-FORWARD/*-DROP_Wirelessforward* +rm -rf /var/log/rrd*/collectd/localhost/iptables-filter-OUTGOINGFW +POSTCLEAN=`du -sh /var/log/rrd/collectd` +# +echo Cleaned up collectd directory from $PRECLEAN to $POSTCLEAN size. +# +# Start collectd +/etc/init.d/collectd start +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +# +# USB Modeswitch conf now called setup, rename ... +# +if [ -e /etc/usb_modeswitch.conf ]; then +mv -f /etc/usb_modeswitch.conf /etc/usb_modeswitch.setup +fi +# +# rebuild qosscript if enabled... +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi +# +# +# convert ipsec.conf from openswan to strongswan... +mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org +cat /var/ipfire/vpn/ipsec.conf.org | \ +grep -v "disablearrivalcheck=" | \ +grep -v "klipsdebug=" | \ +grep -v "leftfirewall=" | \ +grep -v "lefthostaccess=" | \ +grep -v "charonstart=" | \ +grep -v "aggrmode=" > /var/ipfire/vpn/ipsec.conf +sed -i "s|ipsec[0-9]=||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|nat_t ||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|klips ||g" /var/ipfire/vpn/ipsec.conf +sed -i "s|^conn [A-Za-z].*$|&\n\tleftfirewall=yes\n\tlefthostaccess=yes|g" /var/ipfire/vpn/ipsec.conf +sed -i "s|^config setup$|&\n\tcharonstart=no|g" /var/ipfire/vpn/ipsec.conf +chown nobody:nobody /var/ipfire/vpn/ipsec.conf +chmod 644 /var/ipfire/vpn/ipsec.conf +# +# Add cryptodev to /etc/sysconfig/modules +mv /etc/sysconfig/modules /etc/sysconfig/modules.org +cat /etc/sysconfig/modules.org | \ +grep -v "cryptodev" | \ +grep -v "# End /etc/sysconfig/modules" > /etc/sysconfig/modules +echo "" >> /etc/sysconfig/modules +echo "### cryptodev" >> /etc/sysconfig/modules +echo "#" >> /etc/sysconfig/modules +echo "cryptodev" >> /etc/sysconfig/modules +echo "" >> /etc/sysconfig/modules +echo "# End /etc/sysconfig/modules" >> /etc/sysconfig/modules +chmod 644 /etc/sysconfig/modules +# Change version of Pakfire.conf +# +sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-38 " *** Please reboot... *** "' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & +# +# Start squid +/etc/init.d/squid start +# +echo +echo Please wait until pakfire has ended... +echo diff --git a/config/rootfiles/oldcore/39/exclude b/config/rootfiles/oldcore/39/exclude new file mode 100644 index 0000000..778cdf7 --- /dev/null +++ b/config/rootfiles/oldcore/39/exclude @@ -0,0 +1,2 @@ +etc/ppp/chap-secrets +etc/ppp/pap-secrets diff --git a/config/rootfiles/oldcore/39/filelists/files b/config/rootfiles/oldcore/39/filelists/files new file mode 100644 index 0000000..b83814e --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/files @@ -0,0 +1,17 @@ +etc/system-release +etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/networking/red +etc/rc.d/helper/getdnsfromdhcpc.pl +srv/web/ipfire/cgi-bin/pppsetup.cgi +usr/local/bin/backupiso +usr/local/bin/updxlratorctrl +usr/local/bin/urlfilterctrl +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +/opt/pakfire/lib/functions.pl +var/ipfire/langs/de.pl +var/ipfire/langs/en.pl +var/ipfire/langs/es.pl +var/ipfire/langs/fr.pl diff --git a/config/rootfiles/oldcore/39/filelists/libevent b/config/rootfiles/oldcore/39/filelists/libevent new file mode 120000 index 0000000..3bbbc1a --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/libevent @@ -0,0 +1 @@ +../../../common/libevent \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/libpng b/config/rootfiles/oldcore/39/filelists/libpng new file mode 120000 index 0000000..8ef96e2 --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/libpng @@ -0,0 +1 @@ +../../../common/libpng \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/ppp b/config/rootfiles/oldcore/39/filelists/ppp new file mode 120000 index 0000000..4844a9b --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/ppp @@ -0,0 +1 @@ +../../../common/ppp \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/strongswan b/config/rootfiles/oldcore/39/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/oldcore/39/filelists/terminfo-screen b/config/rootfiles/oldcore/39/filelists/terminfo-screen new file mode 100644 index 0000000..98962f5 --- /dev/null +++ b/config/rootfiles/oldcore/39/filelists/terminfo-screen @@ -0,0 +1,11 @@ +usr/share/terminfo/s/screen +usr/share/terminfo/s/screen-bce +usr/share/terminfo/s/screen-s +usr/share/terminfo/s/screen-w +usr/share/terminfo/s/screen.linux +usr/share/terminfo/s/screen.teraterm +usr/share/terminfo/s/screen.xterm-new +usr/share/terminfo/s/screen.xterm-r6 +usr/share/terminfo/s/screen.xterm-xfree86 +usr/share/terminfo/s/screen2 +usr/share/terminfo/s/screen3 diff --git a/config/rootfiles/oldcore/39/meta b/config/rootfiles/oldcore/39/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/39/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/39/update.sh b/config/rootfiles/oldcore/39/update.sh new file mode 100644 index 0000000..a54f5b8 --- /dev/null +++ b/config/rootfiles/oldcore/39/update.sh @@ -0,0 +1,48 @@ +#!/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) 2010 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# Cleanup crontab +cat /var/spool/cron/root.orig | grep -v updatexlrator | grep -v urlfilter > /var/spool/cron/root.orig.temp +mv -f /var/spool/cron/root.orig.temp /var/spool/cron/root.orig +fcrontab -z + +# +#Stop services + +# +#Extract files +extract_files +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f0b0afc..6bd1176 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -90,6 +90,7 @@ * diffutils-2.8.1 * dnsmasq-2.45 * dosfstools-3.0.9 +* dracut-006 * e1000-8.0.19-kmod-2.6.32.15-ipfire * e1000-8.0.19-kmod-2.6.32.15-ipfire-xen * e1000e-1.1.19-kmod-2.6.32.15-ipfire @@ -162,7 +163,6 @@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* klibc-1.5.14 * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire * kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen * kudzu-1.2.64 @@ -228,7 +228,6 @@ * miau-0.6.5 * minicom-2.4 * misc-progs -* mkinitcpio-0.5.9 * mktemp-1.5 * mldonkey-3.0.0 * module-init-tools-3.5 @@ -324,7 +323,7 @@ * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.5 -* syslinux-3.62 +* syslinux-3.86 * sysstat-6.0.2 * sysvinit-2.86 * taglib-1.5 @@ -338,8 +337,7 @@ * traceroute-2.0.12 * tripwire-2.4.1.2 * tunctl -* udev-096 -* udev-096-klibc +* udev-125 * unzip552 * urlgrabber-3.1.0 * usb-modeswitch-1.1.2 diff --git a/lfs/nut b/lfs/nut index b5a5eda..c0b7c57 100644 --- a/lfs/nut +++ b/lfs/nut @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -82,7 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-wrap=no --with-udev-dir=/etc/udev cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules +# sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules -mkdir -p /var/state/ups install -v -m 644 $(DIR_SRC)/config/backup/includes/nut \ /var/ipfire/backup/addons/includes/nut diff --git a/lfs/xen-image b/lfs/xen-image index a6e4f36..09e7671 100644 --- a/lfs/xen-image +++ b/lfs/xen-image @@ -127,11 +127,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i -e "s|DEVICE4|/dev/xvda4|g" $(MNThdd)/etc/fstab sed -i -e "s|FSTYPE|ext3|g" $(MNThdd)/etc/fstab - cp -f $(MNThdd)/etc/mkinitcpio.conf $(MNThdd)/etc/mkinitcpio.conf.org - sed -i -e "s| autodetect | |g" $(MNThdd)/etc/mkinitcpio.conf - chroot $(MNThdd) /sbin/mkinitcpio -g /boot/ipfirerd-$(KVER)-xen.img -k $(KVER)-ipfire-xen - cp -f $(MNThdd)/etc/mkinitcpio.conf.org $(MNThdd)/etc/mkinitcpio.conf + chroot $(MNThdd) /sbin/dracut --force --verbose /boot/ipfirerd-$(KVER)-xen.img $(KVER)-ipfire-xen # Create a script for rebuild-initrd and setup hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 16a61778633c7924fd60bb6f1fd7d51b717fe4ef
by git＠ipfire.org 01 Aug '10

01 Aug '10

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, master has been updated via 16a61778633c7924fd60bb6f1fd7d51b717fe4ef (commit) from f824c939b9e23597a706fcaa328876b76e391f82 (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 16a61778633c7924fd60bb6f1fd7d51b717fe4ef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 1 12:02:10 2010 +0200 dnsmasq: Make command line customizeable. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/dnsmasq | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/dnsmasq b/src/initscripts/init.d/dnsmasq index 0dfb1f4..1185921 100644 --- a/src/initscripts/init.d/dnsmasq +++ b/src/initscripts/init.d/dnsmasq @@ -15,6 +15,11 @@ . /etc/sysconfig/rc . ${rc_functions} +# Pull custom configuration file +if [ -e "/etc/sysconfig/dnsmasq" ]; then + . /etc/sysconfig/dnsmasq +fi + SHOW_SRV=1 case "${1}" in @@ -41,7 +46,8 @@ case "${1}" in [ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf" ARGS="$ARGS --domain=`cat /var/ipfire/main/settings |grep DOMAIN |cut -d = -f 2`" - + ARGS="$ARGS $CUSTOM_ARGS" + loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then 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 2010