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 4511d23b541fd6145fea5f116febeb682ae16e31 (commit) via 0584a20725721456e1d3b9fa6de2ed9ab5d4bc0d (commit) via 19ec7aade6758daef2f7dd1a757195460349679a (commit) via ab3774d1ea0908e4d1dba9dc247c5f6f2367bc94 (commit) via 1a99ee7a20ba8433a85c2b57a17d8a4271ac9142 (commit) via 5358d1ec44d92160462e52a4a90c25bd99fb197c (commit) from 5932b3772226b22a61377a9dca5e946f00b70628 (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 4511d23b541fd6145fea5f116febeb682ae16e31 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 22 01:38:26 2010 +0200
pppd: Add patch to create a new ifname option.
commit 0584a20725721456e1d3b9fa6de2ed9ab5d4bc0d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 21 22:27:09 2010 +0200
zlib: Disable parallel build.
commit 19ec7aade6758daef2f7dd1a757195460349679a Merge: 1a99ee7a20ba8433a85c2b57a17d8a4271ac9142 ab3774d1ea0908e4d1dba9dc247c5f6f2367bc94 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 21 20:46:51 2010 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit ab3774d1ea0908e4d1dba9dc247c5f6f2367bc94 Merge: 5932b3772226b22a61377a9dca5e946f00b70628 5358d1ec44d92160462e52a4a90c25bd99fb197c Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 21 20:45:15 2010 +0200
Merge branch 'new-packages' into next
Conflicts: pkgs/toolchain/glibc/patches
commit 1a99ee7a20ba8433a85c2b57a17d8a4271ac9142 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 20 23:10:19 2010 +0200
naoki: Add reverse dependencies.
commit 5358d1ec44d92160462e52a4a90c25bd99fb197c Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Apr 28 14:44:12 2010 +0200
basesystem: New package.
-----------------------------------------------------------------------
Summary of changes: naoki/backend.py | 9 ++ .../{pyfire/pyfire.nm => basesystem/basesystem.nm} | 24 ++-- {config/etc => pkgs/core/basesystem}/resolv.conf | 0 pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch | 126 ++++++++++++++++++++ pkgs/core/zlib/zlib.nm | 2 + 5 files changed, 148 insertions(+), 13 deletions(-) copy pkgs/core/{pyfire/pyfire.nm => basesystem/basesystem.nm} (82%) rename {config/etc => pkgs/core/basesystem}/resolv.conf (100%) create mode 100644 pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch
Difference in files: diff --git a/config/etc/resolv.conf b/config/etc/resolv.conf deleted file mode 100644 index bbc8559..0000000 --- a/config/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -nameserver 127.0.0.1 diff --git a/naoki/backend.py b/naoki/backend.py index b117781..afb7cd5 100644 --- a/naoki/backend.py +++ b/naoki/backend.py @@ -343,6 +343,15 @@ class PackageInfo(object): return self._dependencies("PKG_TOOLCHAIN_DEPENDENCIES", toolchain=True)
@property + def dependencies_reversed(self): + deps = [] + for package in parse_package_info(get_package_names()): + if self.name in [dep.name for dep in package.dependencies]: + deps.append(package.name) + + return deps + + @property def description(self): return self._data.get("PKG_DESCRIPTION")
diff --git a/pkgs/core/basesystem/basesystem.nm b/pkgs/core/basesystem/basesystem.nm new file mode 100644 index 0000000..df9ce61 --- /dev/null +++ b/pkgs/core/basesystem/basesystem.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# 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 = basesystem +PKG_VER = +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Base +PKG_URL = +PKG_LICENSE = GPLv3+ +PKG_SUMMARY = Basic system files. + +define PKG_DESCRIPTION + This package contains files that are needed to run basic \ + functions of the system. +endef + +STAGE_PREPARE = # Nothing to do +STAGE_BUILD = # Nothing to do + +define STAGE_INSTALL + -mkdir -pv $(BUILDROOT)/etc + cp -vf $(DIR_SOURCE)/resolv.conf $(BUILDROOT)/etc/ +endef + diff --git a/pkgs/core/basesystem/resolv.conf b/pkgs/core/basesystem/resolv.conf new file mode 100644 index 0000000..bbc8559 --- /dev/null +++ b/pkgs/core/basesystem/resolv.conf @@ -0,0 +1 @@ +nameserver 127.0.0.1 diff --git a/pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch b/pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch new file mode 100644 index 0000000..50b96c9 --- /dev/null +++ b/pkgs/core/ppp/patches/ppp-2.4.2-ifname.patch @@ -0,0 +1,126 @@ +--- ./pppd/main.c.orig 2004-07-19 12:35:22.000000000 +0000 ++++ ./pppd/main.c 2004-07-19 14:34:38.542120946 +0000 +@@ -98,7 +98,7 @@ + static const char rcsid[] = RCSID; + + /* interface vars */ +-char ifname[32]; /* Interface name */ ++char ifname[MAXIFNAMELEN]; /* Interface name */ + int ifunit; /* Interface unit number */ + + struct channel *the_channel; +@@ -261,13 +261,6 @@ + NULL + }; + +-/* +- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name. +- */ +-#if !defined(PPP_DRV_NAME) +-#define PPP_DRV_NAME "ppp" +-#endif /* !defined(PPP_DRV_NAME) */ +- + int + main(argc, argv) + int argc; +@@ -777,8 +770,11 @@ + set_ifunit(iskey) + int iskey; + { +- info("Using interface %s%d", PPP_DRV_NAME, ifunit); ++ if (req_ifname[0] != '\0') ++ slprintf(ifname, sizeof(ifname), req_ifname); ++ else + slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit); ++ info("Using interface %s", ifname); + script_setenv("IFNAME", ifname, iskey); + if (iskey) { + create_pidfile(getpid()); /* write pid to file */ +--- ./pppd/options.c.orig 2004-07-19 12:59:21.000000000 +0000 ++++ ./pppd/options.c 2004-07-19 14:35:04.253865964 +0000 +@@ -102,6 +102,7 @@ + bool tune_kernel; /* may alter kernel settings */ + int connect_delay = 1000; /* wait this many ms after connect script */ + int req_unit = -1; /* requested interface unit */ ++char req_ifname[MAXIFNAMELEN]; /* requested interface name */ + bool multilink = 0; /* Enable multilink operation */ + char *bundle_name = NULL; /* bundle name for multilink */ + bool dump_options; /* print out option values */ +@@ -259,6 +260,10 @@ + "PPP interface unit number to use if possible", + OPT_PRIO | OPT_LLIMIT, 0, 0 }, + ++ { "ifname", o_string, req_ifname, ++ "Set PPP interface name", ++ OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN }, ++ + { "dump", o_bool, &dump_options, + "Print out option values after parsing all options", 1 }, + { "dryrun", o_bool, &dryrun, +--- ./pppd/pppd.8.orig 2004-07-19 14:39:06.639320497 +0000 ++++ ./pppd/pppd.8 2004-07-19 15:00:37.339448432 +0000 +@@ -1020,7 +1020,12 @@ + .TP + .B unit \fInum + Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound +-connections. ++connections. If the unit is already in use a dynamically allocated will be ++used. ++.TP ++.B ifname \fIstring ++Set the ppp interface name for outbound connections. A failure to set the ++name will terminate the pppd. + .TP + .B updetach + With this option, pppd will detach from its controlling terminal once +--- ./pppd/pppd.h.orig 2004-07-19 12:59:16.000000000 +0000 ++++ ./pppd/pppd.h 2004-07-19 15:02:08.792752747 +0000 +@@ -80,6 +80,16 @@ + #define MAXARGS 1 /* max # args to a command */ + #define MAXNAMELEN 256 /* max length of hostname or name for auth */ + #define MAXSECRETLEN 256 /* max length of password or secret */ ++#define MAXIFNAMELEN 32 /* max length of interface name; or use IFNAMSIZ, can we ++ always include net/if.h? */ ++ ++/* ++ * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name. ++ * Where should PPP_DRV_NAME come from? Do we include it here? ++ */ ++#if !defined(PPP_DRV_NAME) ++#define PPP_DRV_NAME "ppp" ++#endif /* !defined(PPP_DRV_NAME) */ + + /* + * Option descriptor structure. +@@ -304,6 +314,7 @@ + extern int connect_delay; /* Time to delay after connect script */ + extern int max_data_rate; /* max bytes/sec through charshunt */ + extern int req_unit; /* interface unit number to use */ ++extern char req_ifname[MAXIFNAMELEN]; /* interface name to use */ + extern bool multilink; /* enable multilink operation */ + extern bool noendpoint; /* don't send or accept endpt. discrim. */ + extern char *bundle_name; /* bundle name for multilink */ +--- ./pppd/sys-linux.c.orig 2004-07-19 12:33:29.000000000 +0000 ++++ ./pppd/sys-linux.c 2004-07-19 14:37:36.463754450 +0000 +@@ -649,6 +649,21 @@ + } + if (x < 0) + error("Couldn't create new ppp unit: %m"); ++ ++ if (x == 0 && req_ifname[0] != '\0') { ++ struct ifreq ifr; ++ char t[MAXIFNAMELEN]; ++ memset(&ifr, 0, sizeof(struct ifreq)); ++ slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit); ++ strncpy(ifr.ifr_name, t, IF_NAMESIZE); ++ strncpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE); ++ x = ioctl(sock_fd, SIOCSIFNAME, &ifr); ++ if (x < 0) ++ error("Couldn't rename interface %s to %s: %m", t, req_ifname); ++ else ++ info("Renamed interface %s to %s", t, req_ifname); ++ } ++ + return x; + } + diff --git a/pkgs/core/zlib/zlib.nm b/pkgs/core/zlib/zlib.nm index 76f728d..5fb2e80 100644 --- a/pkgs/core/zlib/zlib.nm +++ b/pkgs/core/zlib/zlib.nm @@ -52,6 +52,8 @@ CONFIGURE_ENVIRONMENT += ac_cv_func_working_mktime=yes CONFIGURE_OPTIONS += \ --libdir=/lib
+PARALLELISMFLAGS = # No parallelism + define STAGE_TEST cd $(DIR_APP) && make check endef
hooks/post-receive -- IPFire 3.x development tree