IPFire-SCM February 2011

ipfire-scm@lists.ipfire.org

1 participants
67 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 48a2495afd78163adfd984689ab1c08091fdd2d3
by git＠ipfire.org 18 Feb '11

18 Feb '11

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 48a2495afd78163adfd984689ab1c08091fdd2d3 (commit) via abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 (commit) from db0798e82af1d7bdc83f319d06276c923d4fc012 (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 48a2495afd78163adfd984689ab1c08091fdd2d3 Merge: abcbbd1 db0798e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 18 20:33:00 2011 +0100 Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x Conflicts: config/rootfiles/core/47/filelists/files commit abcbbd1fd7d11549b7c44e301f17a4b9596a04b5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 18 20:31:19 2011 +0100 Add ssh ecdsa hostkey. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/47/filelists/files | 2 ++ config/rootfiles/core/47/update.sh | 5 +++++ html/cgi-bin/remote.cgi | 3 ++- src/initscripts/init.d/sshd | 1 + 4 files changed, 10 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index befb6bf..adbbd29 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,4 +1,6 @@ etc/system-release +etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/ids.cgi var/ipfire/backup/include diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh index b67200a..ef10f55 100644 --- a/config/rootfiles/core/47/update.sh +++ b/config/rootfiles/core/47/update.sh @@ -34,6 +34,11 @@ rm -f /var/cache/pakfire/core-upgrade-*.ipfire #Extract files extract_files +#Generate ssh ecdsa host key if not present +if [ ! -e /etc/ssh/ssh_host_ecdsa_key ]; then + ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa +fi + # #Start services diff --git a/html/cgi-bin/remote.cgi b/html/cgi-bin/remote.cgi index 9737b07..ed8a94d 100644 --- a/html/cgi-bin/remote.cgi +++ b/html/cgi-bin/remote.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -180,6 +180,7 @@ END &viewkey("/etc/ssh/ssh_host_key.pub","RSA1"); &viewkey("/etc/ssh/ssh_host_rsa_key.pub","RSA2"); &viewkey("/etc/ssh/ssh_host_dsa_key.pub","DSA"); +&viewkey("/etc/ssh/ssh_host_ecdsa_key.pub","ECDSA"); print "</table>\n"; diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd index 1bd2346..e99e694 100644 --- a/src/initscripts/init.d/sshd +++ b/src/initscripts/init.d/sshd @@ -17,6 +17,7 @@ case "$1" in ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N '' ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1 ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa + ssh-keygen -qf /etc/ssh/ssh_host_ecdsa_key -N '' -t ecdsa fi [ -e "/var/ipfire/remote/enablessh" ] || exit 0 # SSH is not enabled hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. db0798e82af1d7bdc83f319d06276c923d4fc012
by git＠ipfire.org 16 Feb '11

16 Feb '11

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 db0798e82af1d7bdc83f319d06276c923d4fc012 (commit) via 6f928c4d380d096a1abd0831c2c1de1a920b3ad1 (commit) via c74f6bce72cad9e2599416d9602dd426d864f1d4 (commit) via 8b316677104f8bd40a29979052bc546daee02454 (commit) from 9fd6aa06b69bf944ac615439ee28d328578af23a (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 db0798e82af1d7bdc83f319d06276c923d4fc012 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 16 21:07:41 2011 +0100 fireinfo: Update to version 2.0.5. commit 6f928c4d380d096a1abd0831c2c1de1a920b3ad1 Merge: c74f6bc 9fd6aa0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 16 21:05:32 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x commit c74f6bce72cad9e2599416d9602dd426d864f1d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 6 19:55:23 2011 +0100 icecc: Update of initscript. commit 8b316677104f8bd40a29979052bc546daee02454 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 6 19:27:55 2011 +0100 icecc: Update to 0.9.6. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 4 +- lfs/icecc | 13 ++-- src/initscripts/init.d/icecream | 20 ++++-- src/patches/icecream-rename-scheduler.patch | 107 +++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 14 deletions(-) create mode 100644 src/patches/icecream-rename-scheduler.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 6c502e1..6c2177a 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -24,7 +24,7 @@ include Config -VER = 2.0.4 +VER = 2.0.5 THISAPP = fireinfo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7433e108cce180980189339886621539 +$(DL_FILE)_MD5 = e0e959a6891262f45fc1cedc225a662b install : $(TARGET) diff --git a/lfs/icecc b/lfs/icecc index a5b7af4..d661b19 100644 --- a/lfs/icecc +++ b/lfs/icecc @@ -24,15 +24,15 @@ include Config -VER = 0.9.4.8 +VER = 0.9.6 -THISAPP = icecream-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = icecc-$(VER) +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = icecc -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f304865d3f68d0d5ee2c2084571b7b28 +$(DL_FILE)_MD5 = c6dacb3f28eade45f603a99245cde4fd install : $(TARGET) @@ -76,7 +76,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/icecream-rename-scheduler.patch cd $(DIR_APP) && ./configure \ --prefix=/opt/icecream cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) diff --git a/src/initscripts/init.d/icecream b/src/initscripts/init.d/icecream index 6ce4660..f8fa4e3 100644 --- a/src/initscripts/init.d/icecream +++ b/src/initscripts/init.d/icecream @@ -15,24 +15,32 @@ . /etc/sysconfig/rc . ${rc_functions} -SCHEDULER=minerva.ipfire.org +#SCHEDULER=minerva.ipfire.org +ENABLE_SCHEDULER=on JOBS=8 -PORT=10244 case "${1}" in start) boot_mesg "Starting Icecream Daemon..." - /opt/icecream/sbin/iceccd -d -s ${SCHEDULER} -m ${JOBS} -p ${PORT} + ARGS="-d -m ${JOBS}" + if [ -n "${SCHEDULER}" ]; then + ARGS="${ARGS} -s ${SCHEDULER}" + fi + /opt/icecream/sbin/iceccd ${ARGS} evaluate_retval - if ! grep -q "${PORT}" /var/ipfire/xtaccess/config ; then - echo "tcp,0.0.0.0/0,${PORT},on,0.0.0.0,Icecream" >> /var/ipfire/xtaccess/config - /usr/local/bin/setxtaccess + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + /opt/icecream/sbin/icecc-scheduler -d fi ;; stop) boot_mesg "Stopping Icecream Daemon..." killproc /opt/icecream/sbin/iceccd + + if [ "${ENABLE_SCHEDULER}" = "on" ]; then + killproc /opt/icecream/sbin/icecc-scheduler + fi ;; restart) diff --git a/src/patches/icecream-rename-scheduler.patch b/src/patches/icecream-rename-scheduler.patch new file mode 100644 index 0000000..5de7738 --- /dev/null +++ b/src/patches/icecream-rename-scheduler.patch @@ -0,0 +1,107 @@ +Index: icecc-0.9.6/doc/man-scheduler.1.docbook +=================================================================== +--- icecc-0.9.6.orig/doc/man-scheduler.1.docbook ++++ icecc-0.9.6/doc/man-scheduler.1.docbook +@@ -23,13 +23,13 @@ + </refmeta> + + <refnamediv> +- <refname>scheduler</refname> ++ <refname>icecc-scheduler</refname> + <refpurpose>Icecream scheduler</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> +-<command>scheduler</command> ++<command>icecc-scheduler</command> + <group> + <arg choice="opt"> + <option>-n</option> +@@ -151,7 +151,7 @@ need to run the scheduler with root righ + + <refsect1> + <title>See Also</title> +-<para>icecream, scheduler, iceccd, icemon</para> ++<para>icecream, icecc-scheduler, iceccd, icemon</para> + </refsect1> + + <refsect1> +Index: icecc-0.9.6/services/Makefile.am +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.am ++++ icecc-0.9.6/services/Makefile.am +@@ -11,9 +11,9 @@ ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc + +-sbin_PROGRAMS = scheduler +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++sbin_PROGRAMS = icecc-scheduler ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc +Index: icecc-0.9.6/services/Makefile.in +=================================================================== +--- icecc-0.9.6.orig/services/Makefile.in ++++ icecc-0.9.6/services/Makefile.in +@@ -37,7 +37,7 @@ PRE_UNINSTALL = : + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-sbin_PROGRAMS = scheduler$(EXEEXT) ++sbin_PROGRAMS = icecc-scheduler$(EXEEXT) + subdir = services + DIST_COMMON = $(ice_HEADERS) $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/icecc.pc.in +@@ -82,9 +82,9 @@ libicecc_la_LINK = $(LIBTOOL) --tag=CXX + $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libicecc_la_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + PROGRAMS = $(sbin_PROGRAMS) +-am_scheduler_OBJECTS = scheduler.$(OBJEXT) +-scheduler_OBJECTS = $(am_scheduler_OBJECTS) +-scheduler_DEPENDENCIES = libicecc.la ++am_icecc_scheduler_OBJECTS = scheduler.$(OBJEXT) ++icecc_scheduler_OBJECTS = $(am_icecc_scheduler_OBJECTS) ++icecc_scheduler_DEPENDENCIES = libicecc.la + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -107,8 +107,8 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +-SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) +-DIST_SOURCES = $(libicecc_la_SOURCES) $(scheduler_SOURCES) ++SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) ++DIST_SOURCES = $(libicecc_la_SOURCES) $(icecc_scheduler_SOURCES) + DATA = $(pkgconfig_DATA) + HEADERS = $(ice_HEADERS) $(noinst_HEADERS) + ETAGS = etags +@@ -242,8 +242,8 @@ libicecc_la_CXXFLAGS = -fPIC -DPIC + ice_HEADERS = job.h comm.h + noinst_HEADERS = bench.h exitcode.h getifaddrs.h logging.h tempfile.h platform.h + icedir = $(includedir)/icecc +-scheduler_SOURCES = scheduler.cpp +-scheduler_LDADD = libicecc.la ++icecc_scheduler_SOURCES = scheduler.cpp ++icecc_scheduler_LDADD = libicecc.la + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = icecc.pc + all: all-am +@@ -358,9 +358,9 @@ clean-sbinPROGRAMS: + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +-scheduler$(EXEEXT): $(scheduler_OBJECTS) $(scheduler_DEPENDENCIES) +- @rm -f scheduler$(EXEEXT) +- $(CXXLINK) $(scheduler_OBJECTS) $(scheduler_LDADD) $(LIBS) ++icecc-scheduler$(EXEEXT): $(icecc_scheduler_OBJECTS) $(icecc_scheduler_DEPENDENCIES) ++ @rm -f icecc-scheduler$(EXEEXT) ++ $(CXXLINK) $(icecc_scheduler_OBJECTS) $(icecc_scheduler_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8ab704939973ab172b0e53c1818a4c48c6de5ada
by git＠ipfire.org 13 Feb '11

13 Feb '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1649f94a57337fbcc69de91fa76eb6d996d1b855
by git＠ipfire.org 13 Feb '11

13 Feb '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9fd6aa06b69bf944ac615439ee28d328578af23a
by git＠ipfire.org 13 Feb '11

13 Feb '11

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 9fd6aa06b69bf944ac615439ee28d328578af23a (commit) from c703cd4ce52abcbd52a7de62c02e20087794af00 (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 9fd6aa06b69bf944ac615439ee28d328578af23a Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Feb 13 10:35:41 2011 +0100 Added outgoing fw groups to backup. ----------------------------------------------------------------------- Summary of changes: config/backup/include | 1 + config/rootfiles/core/47/filelists/files | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/backup/include b/config/backup/include index a5097a9..8806640 100644 --- a/config/backup/include +++ b/config/backup/include @@ -15,6 +15,7 @@ /var/ipfire/auth/users /var/ipfire/dhcp/* /var/ipfire/main/* +/var/ipfire/outgoing/groups /var/ipfire/outgoing/rules /var/ipfire/outgoing/p2protocols /var/ipfire/ovpn diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index ff92311..befb6bf 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,3 +1,4 @@ etc/system-release srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/backup/include hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. f7d695e3ce4a83aab6e63834baa66705a0665976
by git＠ipfire.org 12 Feb '11

12 Feb '11

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 f7d695e3ce4a83aab6e63834baa66705a0665976 (commit) via a045948db063c8916440d3d2878c1a38c6cd8fd0 (commit) via 633a04be361d57fbf98ca8f71489e9630f25c66f (commit) via ccbbe72b99cc25eec776657368bcaf1bba9fc272 (commit) via 14e1f87b140d9bcef2d901ca3a8490ad096f89fe (commit) via e01b6c5b0b54da116921222e6eb4f4cde1b9b553 (commit) via 4d553b0a1e9a4346ca5a0f3cafc508f01ea8a770 (commit) via d99da9f5d22d70273cff89d01021f7fc40323d6b (commit) via 42925db45f41574e669dbba6c2f3de51f989226a (commit) via 2321bb11a2e36b2851f2613556b645ccaf9c8f5c (commit) via b83b4a1e7b8373381c3ed04a680ff23b9e130f74 (commit) via 1a4ec61bf53a8bc7ee1741a95b1a05941175875f (commit) from 80fdbbcd52ad5ac44316b879d82758d436c36f56 (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 f7d695e3ce4a83aab6e63834baa66705a0665976 Merge: a045948 80fdbbc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 12 21:22:52 2011 +0100 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit a045948db063c8916440d3d2878c1a38c6cd8fd0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 12 18:14:14 2011 +0100 Revert "build-essentials: Fix processing of user entered dependencies." This reverts commit ccbbe72b99cc25eec776657368bcaf1bba9fc272. commit 633a04be361d57fbf98ca8f71489e9630f25c66f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 12 16:44:27 2011 +0100 iana-etc: This package has no architecture. commit ccbbe72b99cc25eec776657368bcaf1bba9fc272 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 11 14:44:12 2011 +0100 build-essentials: Fix processing of user entered dependencies. commit 14e1f87b140d9bcef2d901ca3a8490ad096f89fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:17:59 2011 +0100 build-essentials: Build fix and set arch to noarch. commit e01b6c5b0b54da116921222e6eb4f4cde1b9b553 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:17:11 2011 +0100 texinfo: Build fix. commit 4d553b0a1e9a4346ca5a0f3cafc508f01ea8a770 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:16:31 2011 +0100 binutils: Add --host, --build and --target. commit d99da9f5d22d70273cff89d01021f7fc40323d6b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:16:08 2011 +0100 ppl: Build fix. Requires a C++ compiler to be compiled. commit 42925db45f41574e669dbba6c2f3de51f989226a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:15:34 2011 +0100 naoki: Pass --build and --host to configure. commit 2321bb11a2e36b2851f2613556b645ccaf9c8f5c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:08:07 2011 +0100 libnfsidmap: Build fix. Requires a C++ compiler to build. commit b83b4a1e7b8373381c3ed04a680ff23b9e130f74 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:07:17 2011 +0100 attr: Build fix (libtool). commit 1a4ec61bf53a8bc7ee1741a95b1a05941175875f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 7 16:06:54 2011 +0100 acl: Buildfix (libtool). ----------------------------------------------------------------------- Summary of changes: pkgs/Constants | 4 +++- pkgs/core/acl/acl.nm | 2 ++ pkgs/core/attr/attr.nm | 2 ++ pkgs/core/binutils/binutils.nm | 9 +++++---- pkgs/core/build-essentials/build-essentials.nm | 14 +++++++------- pkgs/core/iana-etc/iana-etc.nm | 1 + pkgs/core/libnfsidmap/libnfsidmap.nm | 2 ++ pkgs/core/ppl/ppl.nm | 2 +- pkgs/core/texinfo/texinfo.nm | 15 ++------------- 9 files changed, 25 insertions(+), 26 deletions(-) Difference in files: diff --git a/pkgs/Constants b/pkgs/Constants index c6b634b..d8bedf2 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -41,7 +41,9 @@ export CXXFLAGS # Options that get passed to configure by default CONFIGURE_OPTIONS = \ - --prefix=/usr + --prefix=/usr \ + --build=$(TARGET) \ + --host=$(TARGET) # For compatibility with pakfire3 DISTRO_MACHINE=$(TARGET) diff --git a/pkgs/core/acl/acl.nm b/pkgs/core/acl/acl.nm index 8ba2e31..697e007 100644 --- a/pkgs/core/acl/acl.nm +++ b/pkgs/core/acl/acl.nm @@ -53,6 +53,8 @@ CONFIGURE_OPTIONS += \ --disable-static \ --mandir=/usr/share/man +STAGE_BUILD_TARGETS += LIBTOOL="libtool --tag=CC" + define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib $(BUILDROOT)/usr/include/{acl,sys} install -v -m0755 $(DIR_APP)/libacl/.libs/libacl.so.1.2.0 $(BUILDROOT)/lib diff --git a/pkgs/core/attr/attr.nm b/pkgs/core/attr/attr.nm index 94f217a..3cc2474 100644 --- a/pkgs/core/attr/attr.nm +++ b/pkgs/core/attr/attr.nm @@ -53,6 +53,8 @@ CONFIGURE_OPTIONS += \ --enable-shared \ --mandir=/usr/share/man +STAGE_BUILD_TARGETS += LIBTOOL="libtool --tag=CC" + define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/{,usr/}lib install -v -m0755 $(DIR_APP)/libattr/.libs/libattr.so.1.1.0 $(BUILDROOT)/lib diff --git a/pkgs/core/binutils/binutils.nm b/pkgs/core/binutils/binutils.nm index 8391fa2..77b4930 100644 --- a/pkgs/core/binutils/binutils.nm +++ b/pkgs/core/binutils/binutils.nm @@ -43,10 +43,6 @@ PKG_BUILD_DEPS+= dejagnu texinfo zlib-devel PKG_TARBALL += $(THISAPP).tar.bz2 -############################################################################### -# Installation Details -############################################################################### - define STAGE_PREPARE_CMDS -mkdir -pv $(DIR_SRC)/binutils-build @@ -56,9 +52,14 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -e '/^INFO/s/standards.info //' -i etc/Makefile.in endef +BINUTILS_TARGET_PLATFORM = $(subst -gnu,,$(DISTRO_MACHINE)) + define STAGE_BUILD cd $(DIR_SRC)/binutils-build && \ ../$(THISAPP)/configure \ + --host=$(BINUTILS_TARGET_PLATFORM) \ + --build=$(BINUTILS_TARGET_PLATFORM) \ + --target=$(BINUTILS_TARGET_PLATFORM) \ --prefix=/usr \ --mandir=/usr/share/man \ --enable-shared \ diff --git a/pkgs/core/build-essentials/build-essentials.nm b/pkgs/core/build-essentials/build-essentials.nm index a1d2d60..9ea5643 100644 --- a/pkgs/core/build-essentials/build-essentials.nm +++ b/pkgs/core/build-essentials/build-essentials.nm @@ -26,8 +26,8 @@ include $(PKGROOT)/Include PKG_NAME = build-essentials PKG_VER = $(DISTRO_VERSION) -PKG_REL = 2 -#PKG_ARCH = noarch +PKG_REL = 4 +PKG_ARCH = noarch PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Tools @@ -52,15 +52,15 @@ define STAGE_INSTALL -mkdir -pv $(BUILDROOT)/usr/lib/buildsystem{,-tools} -mkdir -pv $(BUILDROOT)/usr/lib/quality-agent - cp -vf buildsystem/* $(BUILDROOT)/usr/lib/buildsystem - cp -vf buildsystem-tools/* $(BUILDROOT)/usr/lib/buildsystem-tools + cp -vf $(DIR_SOURCE)/buildsystem/* $(BUILDROOT)/usr/lib/buildsystem + cp -vf $(DIR_SOURCE)/buildsystem-tools/* $(BUILDROOT)/usr/lib/buildsystem-tools - cp -vf quality-agent/quality-agent $(BUILDROOT)/usr/sbin/ - cp -vrf quality-agent/quality-agent.d/* \ + cp -vf $(DIR_SOURCE)/quality-agent/quality-agent $(BUILDROOT)/usr/sbin/ + cp -vrf $(DIR_SOURCE)/quality-agent/quality-agent.d/* \ $(BUILDROOT)/usr/lib/quality-agent/ -mkdir -pv $(BUILDROOT)/etc/profile.d - cp -vf buildsystem.sh $(BUILDROOT)/etc/profile.d/ + cp -vf $(DIR_SOURCE)/buildsystem.sh $(BUILDROOT)/etc/profile.d/ # Create symlink to chroot-shell ln -svf ../lib/buildsystem-tools/chroot-shell \ diff --git a/pkgs/core/iana-etc/iana-etc.nm b/pkgs/core/iana-etc/iana-etc.nm index 05604c8..86654f7 100644 --- a/pkgs/core/iana-etc/iana-etc.nm +++ b/pkgs/core/iana-etc/iana-etc.nm @@ -27,6 +27,7 @@ include $(PKGROOT)/Include PKG_NAME = iana-etc PKG_VER = 2.30 PKG_REL = 0 +PKG_ARCH = noarch PKG_MAINTAINER = PKG_GROUP = Networking/Tools diff --git a/pkgs/core/libnfsidmap/libnfsidmap.nm b/pkgs/core/libnfsidmap/libnfsidmap.nm index 80fdb79..3a31d7f 100644 --- a/pkgs/core/libnfsidmap/libnfsidmap.nm +++ b/pkgs/core/libnfsidmap/libnfsidmap.nm @@ -34,6 +34,8 @@ PKG_URL = http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/ PKG_LICENSE = BSD PKG_SUMMARY = Library to help mapping id's, mainly for NFSv4. +PKG_BUILD_DEPS+= gcc-c++ + define PKG_DESCRIPTION libnfsidmap provides functions to map between NFSv4 names \ (which are of the form user@domain) and local uid's and gid's. diff --git a/pkgs/core/ppl/ppl.nm b/pkgs/core/ppl/ppl.nm index 28c03eb..eac4af9 100644 --- a/pkgs/core/ppl/ppl.nm +++ b/pkgs/core/ppl/ppl.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.cs.unipr.it/ppl/ PKG_LICENSE = GPLv3+ PKG_SUMMARY = The Parma Polyhedra Library: a library of numerical abstractions. -PKG_BUILD_DEPS+= autoconf automake gmp-devel m4 +PKG_BUILD_DEPS+= autoconf automake gcc-c++ gmp-devel m4 define PKG_DESCRIPTION The Parma Polyhedra Library (PPL) is a library for the manipulation of \ diff --git a/pkgs/core/texinfo/texinfo.nm b/pkgs/core/texinfo/texinfo.nm index efc8110..7f2b102 100644 --- a/pkgs/core/texinfo/texinfo.nm +++ b/pkgs/core/texinfo/texinfo.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.gnu.org/software/texinfo/ PKG_LICENSE = GPLv3 PKG_SUMMARY = Tools needed to create Texinfo format documentation files. -PKG_DEPS += ncurses +PKG_BUILD_DEPS+= ncurses-devel define PKG_DESCRIPTION Texinfo is a documentation system that can produce both online \ @@ -46,18 +46,7 @@ PKG_TARBALL = $(THISAPP).tar.gz DIR_APP = $(DIR_SRC)/$(PKG_NAME)-4.13 -############################################################################### -# Installation Details -############################################################################### - -define STAGE_BUILD - cd $(DIR_APP) && \ - LDFLAGS="-lncursesw" \ - ./configure \ - --prefix=/usr - - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +export LDFLAGS = -lncursesw define STAGE_TEST cd $(DIR_APP) && make check hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 80fdbbcd52ad5ac44316b879d82758d436c36f56
by git＠ipfire.org 11 Feb '11

11 Feb '11

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 80fdbbcd52ad5ac44316b879d82758d436c36f56 (commit) from 38fffe4c19326678ff4914048fda376a42a59e61 (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 80fdbbcd52ad5ac44316b879d82758d436c36f56 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 11 10:12:19 2011 +0100 openssl: Update to 1.0.0d. New upstream release fixing CVE-2011-0014 (OCSP stapling vulnerability). Closes #137. ----------------------------------------------------------------------- Summary of changes: pkgs/core/openssl/openssl.nm | 4 ++-- ...-version.patch => openssl-1.0.0d-version.patch} | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/core/openssl/patches/{openssl-1.0.0c-version.patch => openssl-1.0.0d-version.patch} (60%) Difference in files: diff --git a/pkgs/core/openssl/openssl.nm b/pkgs/core/openssl/openssl.nm index 5fc573c..3f2a2fe 100644 --- a/pkgs/core/openssl/openssl.nm +++ b/pkgs/core/openssl/openssl.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = openssl -PKG_VER = 1.0.0c -PKG_REL = 0 +PKG_VER = 1.0.0d +PKG_REL = 1 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = System/Libraries diff --git a/pkgs/core/openssl/patches/openssl-1.0.0c-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0c-version.patch deleted file mode 100644 index 4ac8277..0000000 --- a/pkgs/core/openssl/patches/openssl-1.0.0c-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up openssl-1.0.0c/crypto/opensslv.h.version openssl-1.0.0c/crypto/opensslv.h ---- openssl-1.0.0c/crypto/opensslv.h.version 2010-12-03 11:55:54.000000000 +0100 -+++ openssl-1.0.0c/crypto/opensslv.h 2010-12-03 11:57:25.000000000 +0100 -@@ -25,7 +25,8 @@ - * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for - * major minor fix final patch/beta) - */ --#define OPENSSL_VERSION_NUMBER 0x1000003f -+/* we have to keep the version number to not break the abi */ -+#define OPENSSL_VERSION_NUMBER 0x10000003 - #ifdef OPENSSL_FIPS - #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0c-fips 2 Dec 2010" - #else -@@ -83,7 +84,7 @@ - * should only keep the versions that are binary compatible with the current. - */ - #define SHLIB_VERSION_HISTORY "" --#define SHLIB_VERSION_NUMBER "1.0.0" -+#define SHLIB_VERSION_NUMBER "1.0.0c" - - - #endif /* HEADER_OPENSSLV_H */ diff --git a/pkgs/core/openssl/patches/openssl-1.0.0d-version.patch b/pkgs/core/openssl/patches/openssl-1.0.0d-version.patch new file mode 100644 index 0000000..da50fb4 --- /dev/null +++ b/pkgs/core/openssl/patches/openssl-1.0.0d-version.patch @@ -0,0 +1,22 @@ +diff -up openssl-1.0.0d/crypto/opensslv.h.version openssl-1.0.0d/crypto/opensslv.h +--- openssl-1.0.0d/crypto/opensslv.h.version 2011-02-10 14:24:52.000000000 +0100 ++++ openssl-1.0.0d/crypto/opensslv.h 2011-02-10 14:48:00.000000000 +0100 +@@ -25,7 +25,8 @@ + * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for + * major minor fix final patch/beta) + */ +-#define OPENSSL_VERSION_NUMBER 0x1000004fL ++/* we have to keep the version number to not break the abi */ ++#define OPENSSL_VERSION_NUMBER 0x10000003 + #ifdef OPENSSL_FIPS + #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0d-fips 8 Feb 2011" + #else +@@ -83,7 +84,7 @@ + * should only keep the versions that are binary compatible with the current. + */ + #define SHLIB_VERSION_HISTORY "" +-#define SHLIB_VERSION_NUMBER "1.0.0" ++#define SHLIB_VERSION_NUMBER "1.0.0d" + + + #endif /* HEADER_OPENSSLV_H */ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c703cd4ce52abcbd52a7de62c02e20087794af00
by git＠ipfire.org 10 Feb '11

10 Feb '11

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 c703cd4ce52abcbd52a7de62c02e20087794af00 (commit) from 7fb1b9f680b91b0f3446172c07de7c4e9c106001 (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 c703cd4ce52abcbd52a7de62c02e20087794af00 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Thu Feb 10 21:43:24 2011 +0100 Changed sourcefire download link to current snort version. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/47/filelists/files | 1 + html/cgi-bin/ids.cgi | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index 1df41d9..ff92311 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1,2 +1,3 @@ etc/system-release srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/ids.cgi diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 734e7dc..7da270c 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -264,11 +264,11 @@ if (-e "/etc/snort/snort.conf") { if ($snortsettings{'RULES'} eq 'subscripted') { #$url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$s…'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902_s.tar.gz/$snortsett…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903_s.tar.gz/$snortsett…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz"; } elsif ($snortsettings{'RULES'} eq 'registered') { #$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$sno…'OINKCODE'}"; - $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2902.tar.gz/$snortsettin…'OINKCODE'}"; + $url=" http://www.snort.org/reg-rules/snortrules-snapshot-2903.tar.gz/$snortsettin…'OINKCODE'}"; #$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8.tar.gz"; } else { $url="http://rules.emergingthreats.net/open/snort-2.9.0/emerging.rules.tar.gz"; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7fb1b9f680b91b0f3446172c07de7c4e9c106001
by git＠ipfire.org 10 Feb '11

10 Feb '11

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 7fb1b9f680b91b0f3446172c07de7c4e9c106001 (commit) from 0ccf2cc4170c0072b88246938d793b624ac71c4e (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 7fb1b9f680b91b0f3446172c07de7c4e9c106001 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 10 19:49:23 2011 +0100 Fix addon service pid/memory display if the addon name has numbers. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/47/filelists/files | 1 + html/cgi-bin/services.cgi | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files index 0037af1..1df41d9 100644 --- a/config/rootfiles/core/47/filelists/files +++ b/config/rootfiles/core/47/filelists/files @@ -1 +1,2 @@ etc/system-release +srv/web/ipfire/cgi-bin/services.cgi diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 424ca86..b6efe09 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -279,6 +279,7 @@ sub isrunningaddon{ if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){ $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>"; + $testcmd =~ s/.* //gi; $testcmd =~ s/[a-z_]//gi; $testcmd =~ s/\[[0-1]\;[0-9]+//gi; $testcmd =~ s/[\.]//gi; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0ccf2cc4170c0072b88246938d793b624ac71c4e
by git＠ipfire.org 10 Feb '11

10 Feb '11

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 0ccf2cc4170c0072b88246938d793b624ac71c4e (commit) from 84d2c3089cd95f27bd6acbbe3772d7ab88a923e9 (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 0ccf2cc4170c0072b88246938d793b624ac71c4e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 10 19:47:03 2011 +0100 Start core47. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/24 => core/47}/exclude | 0 config/rootfiles/core/47/filelists/files | 1 + config/rootfiles/core/{44 => 47}/meta | 0 config/rootfiles/{oldcore/42 => core/47}/update.sh | 12 +++++++++--- make.sh | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/24 => core/47}/exclude (100%) create mode 100644 config/rootfiles/core/47/filelists/files copy config/rootfiles/core/{44 => 47}/meta (100%) copy config/rootfiles/{oldcore/42 => core/47}/update.sh (84%) Difference in files: diff --git a/config/rootfiles/core/47/exclude b/config/rootfiles/core/47/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/47/filelists/files b/config/rootfiles/core/47/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/47/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/47/meta b/config/rootfiles/core/47/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/47/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/47/update.sh b/config/rootfiles/core/47/update.sh new file mode 100644 index 0000000..b67200a --- /dev/null +++ b/config/rootfiles/core/47/update.sh @@ -0,0 +1,54 @@ +#!/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) 2011 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove core updates from pakfire cache to save space... +rm -f /var/cache/pakfire/core-upgrade-*.ipfire +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.28-ipfire >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-pae >/dev/null 2>&1 +#depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1 + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index 8ca428e..2a8abc8 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.9" # Version number -CORE="46" # Core Level (Filename) +CORE="47" # Core Level (Filename) PAKFIRE_CORE="46" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2011