IPFire-SCM April 2010

ipfire-scm@lists.ipfire.org

1 participants
83 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8f246e3f06ac1933d6a0440aab9c3c7271b8cca8
by git＠ipfire.org 14 Apr '10

14 Apr '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 8f246e3f06ac1933d6a0440aab9c3c7271b8cca8 (commit) via d7b55070f47c8cb9c96b8266cb41aa178612ee98 (commit) from faf914cae28ec95c33cee3b869f55abe8df2727e (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 8f246e3f06ac1933d6a0440aab9c3c7271b8cca8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 14 20:24:59 2010 +0200 kbd: Cleanup makefile. commit d7b55070f47c8cb9c96b8266cb41aa178612ee98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 14 20:23:17 2010 +0200 kbd: Remove run of autoreconf. We do not need this, I think. ----------------------------------------------------------------------- Summary of changes: pkgs/core/kbd/kbd.nm | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) Difference in files: diff --git a/pkgs/core/kbd/kbd.nm b/pkgs/core/kbd/kbd.nm index 01457c7..4cad4fa 100644 --- a/pkgs/core/kbd/kbd.nm +++ b/pkgs/core/kbd/kbd.nm @@ -34,8 +34,6 @@ PKG_URL = http://ftp.altlinux.org/pub/people/legion/kbd PKG_LICENSE = GPLv2+ PKG_SUMMARY = Tools for configuring the console (keyboard, virtual terminals, etc.). -PKG_BUILD_DEPS+= autoconf automake - define PKG_DESCRIPTION The kbd package contains tools for managing a Linux \ system's console's behavior, including the keyboard, the screen \ @@ -48,22 +46,13 @@ PKG_OBJECTS += kbd-latsun-fonts.tar.bz2 CONFIGURE_OPTIONS += --datadir=/lib/kbd -############################################################################### -# Installation Details -############################################################################### - define STAGE_PREPARE_CMDS # Adding our own fonts cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/kbd-latsun-fonts.tar.bz2 cd $(DIR_APP) && $(DO_EXTRACT) $(DIR_DL)/kbd-latarcyrheb-16-fixed.tar.bz2 - - cd $(DIR_APP) && autoreconf --force --install - cd $(DIR_APP) && sed -i "s/ifdef OPTIONAL_PROGS/ifeq (\$$(OPTIONAL_PROGS),yes)/" man/Makefile.in endef -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) - +define STAGE_INSTALL_CMDS -mkdir -pv $(BUILDROOT)/bin mv -v $(BUILDROOT)/usr/bin/{kbd_mode,loadkeys,openvt,setfont} $(BUILDROOT)/bin endef hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c655052559efdbc2dbfe16a69a5cef2f1d27e530
by git＠ipfire.org 14 Apr '10

14 Apr '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 c655052559efdbc2dbfe16a69a5cef2f1d27e530 (commit) from e843e8adf08b8d11cae9f9b40346d1680c01c180 (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 c655052559efdbc2dbfe16a69a5cef2f1d27e530 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 14 07:19:38 2010 +0200 External build of kvm modules. ----------------------------------------------------------------------- Summary of changes: doc/packages-list.txt | 3 ++- lfs/kvm-kmod | 4 ++-- make.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 1cb425e..3716f08 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,7 +62,6 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 -* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 @@ -161,6 +160,8 @@ * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire * kqemu-1.4.0pre1-kmod-2.6.32.11-ipfire-xen * kudzu-1.2.64 +* kvm-kmod-2.6.32.9-kmod-2.6.32.11-ipfire +* kvm-kmod-2.6.32.9.tar.bz2 * l7-protocols-2009-05-10 * lame-3.97 * lcd4linux-0.10.1-RC2 diff --git a/lfs/kvm-kmod b/lfs/kvm-kmod index dbaf5e3..b4bb50f 100644 --- a/lfs/kvm-kmod +++ b/lfs/kvm-kmod @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.31.5 +VER = 2.6.32.9 THISAPP = kvm-kmod-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1f5a9ec75efae079487be6db43e3a684 +$(DL_FILE)_MD5 = a66a126a138c1b5a16e00b1da042050c install : $(TARGET) diff --git a/make.sh b/make.sh index c9a225d..f84a5bd 100755 --- a/make.sh +++ b/make.sh @@ -355,7 +355,7 @@ buildipfire() { ipfiremake cryptodev XEN=1 ipfiremake linux ipfiremake kqemu - #ipfiremake kvm-kmod + ipfiremake kvm-kmod ipfiremake v4l-dvb ipfiremake madwifi ipfiremake alsa KMOD=1 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. faf914cae28ec95c33cee3b869f55abe8df2727e
by git＠ipfire.org 13 Apr '10

13 Apr '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 faf914cae28ec95c33cee3b869f55abe8df2727e (commit) via 99845690c150d00b5212fb5058c8aa641137ef7c (commit) via 812a68166ad7439468514965b69928c5785da7d0 (commit) via a1382382a7973d4f61549242a48d51c430818cde (commit) from b9f102b03c8ec311f309b10b583f956ff8a4a7c6 (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 faf914cae28ec95c33cee3b869f55abe8df2727e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 13 22:18:44 2010 +0200 perl: Update to 5.12.0. commit 99845690c150d00b5212fb5058c8aa641137ef7c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 13 19:32:37 2010 +0200 kbd: Update to 1.15.2. commit 812a68166ad7439468514965b69928c5785da7d0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 13 19:32:17 2010 +0200 grub: Cleanup makefile. commit a1382382a7973d4f61549242a48d51c430818cde Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 13 19:31:56 2010 +0200 QA: Add whitelist for NX check. ----------------------------------------------------------------------- Summary of changes: pkgs/Constants | 1 + pkgs/core/grub/grub.nm | 18 +-- pkgs/core/kbd/kbd.nm | 2 +- .../patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch | 109 ------------- pkgs/core/perl/patches/perl-5.10.1-utf8-1.patch | 167 -------------------- pkgs/core/perl/perl.nm | 10 +- tools/quality-agent.d/050-nx | 6 + 7 files changed, 19 insertions(+), 294 deletions(-) delete mode 100644 pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch delete mode 100644 pkgs/core/perl/patches/perl-5.10.1-utf8-1.patch Difference in files: diff --git a/pkgs/Constants b/pkgs/Constants index a52d473..a036797 100644 --- a/pkgs/Constants +++ b/pkgs/Constants @@ -77,5 +77,6 @@ export PKG_DEPS PKG_BUILD_DEPS export CONTROL_PREIN CONTROL_PREUN CONTROL_POSTIN CONTROL_POSTUN export QUALITY_AGENT_WHITELIST_EXECSTACK +export QUALITY_AGENT_WHITELIST_NX export QUALITY_AGENT_WHITELIST_RPATH export QUALITY_AGENT_WHITELIST_SONAME diff --git a/pkgs/core/grub/grub.nm b/pkgs/core/grub/grub.nm index 2cf83d5..f49f71a 100644 --- a/pkgs/core/grub/grub.nm +++ b/pkgs/core/grub/grub.nm @@ -46,22 +46,12 @@ endef PKG_TARBALL = $(THISAPP).tar.gz -define QUALITY_AGENT_WHITELIST_EXECSTACK - /usr/sbin/grub -endef - -#CFLAGS += -fno-strict-aliasing -fno-stack-protector -fno-pic -fno-pie -nopie -#CXXFLAGS = +QUALITY_AGENT_WHITELIST_NX = /usr/bin/*|/usr/sbin/* -define STAGE_BUILD - cd $(DIR_APP) && \ - grub_cv_prog_objcopy_absolute=yes \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc +CFLAGS += -fno-strict-aliasing - cd $(DIR_APP) && make $(PARALLELISMFLAGS) -endef +CONFIGURE_OPTIONS += \ + --sysconfdir=/etc define STAGE_INSTALL cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) diff --git a/pkgs/core/kbd/kbd.nm b/pkgs/core/kbd/kbd.nm index 4c43afd..01457c7 100644 --- a/pkgs/core/kbd/kbd.nm +++ b/pkgs/core/kbd/kbd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = kbd -PKG_VER = 1.15.1 +PKG_VER = 1.15.2 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch b/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch deleted file mode 100644 index adedbb1..0000000 --- a/pkgs/core/perl/patches/perl-5.10.1-USE_MM_LD_RUN_PATH.patch +++ /dev/null @@ -1,109 +0,0 @@ -diff -up perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath perl-5.10.1/lib/ExtUtils/MM_Unix.pm ---- perl-5.10.1/lib/ExtUtils/MM_Unix.pm.runpath 2009-11-18 16:08:45.000000000 +0100 -+++ perl-5.10.1/lib/ExtUtils/MM_Unix.pm 2009-11-18 16:09:32.000000000 +0100 -@@ -944,7 +944,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $ - } - - my $ld_run_path_shell = ""; -- if ($self->{LD_RUN_PATH} ne "") { -+ if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { - $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; - } - -diff -up perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath perl-5.10.1/lib/ExtUtils/Liblist.pm ---- perl-5.10.1/lib/ExtUtils/Liblist.pm.runpath 2009-11-18 16:08:45.000000000 +0100 -+++ perl-5.10.1/lib/ExtUtils/Liblist.pm 2009-11-18 16:09:32.000000000 +0100 -@@ -88,6 +88,11 @@ libraries. LD_RUN_PATH is a colon separ - in LDLOADLIBS. It is passed as an environment variable to the process - that links the shared library. - -+Fedora extension: This generation of LD_RUN_PATH is disabled by default. -+To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH -+MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH -+environment variable). -+ - =head2 BSLOADLIBS - - List of those libraries that are needed but can be linked in -diff -up perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath perl-5.10.1/lib/ExtUtils/MakeMaker.pm ---- perl-5.10.1/lib/ExtUtils/MakeMaker.pm.runpath 2009-11-18 16:08:45.000000000 +0100 -+++ perl-5.10.1/lib/ExtUtils/MakeMaker.pm 2009-11-18 16:32:50.000000000 +0100 -@@ -262,7 +262,7 @@ sub full_setup { - PERL_SRC PERM_DIR PERM_RW PERM_RWX - PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC - PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ -- SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG -+ SIGN SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG - XS_VERSION clean depend dist dynamic_lib linkext macro realclean - tool_autosplit - -@@ -406,7 +406,27 @@ sub new { - # PRINT_PREREQ is RedHatism. - if ("@ARGV" =~ /\bPRINT_PREREQ\b/) { - $self->_PRINT_PREREQ; -- } -+ } -+ -+ # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation -+ if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) -+ &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) -+ ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) -+ &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) -+ ) -+ ) -+ ) -+ { -+ my $v = $1; -+ if( $v ) -+ { -+ $v = ($v=~/=([01])$/)[0]; -+ }else -+ { -+ $v = 1; -+ }; -+ $self->{USE_MM_LD_RUN_PATH}=$v; -+ }; - - print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; - if (-f "MANIFEST" && ! -f "Makefile"){ -@@ -2319,6 +2339,40 @@ precedence. A typemap in the current di - precedence, even if it isn't listed in TYPEMAPS. The default system - typemap has lowest precedence. - -+=item USE_MM_LD_RUN_PATH -+ -+boolean -+The Fedora perl MakeMaker distribution differs from the standard -+upstream release in that it disables use of the MakeMaker generated -+LD_RUN_PATH by default, UNLESS this attribute is specified , or the -+USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. -+ -+The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH -+to the concatenation of every -L ld(1) option directory in which a -l ld(1) -+option library is found, which is used as the ld(1) -rpath option if none -+is specified. This means that, if your application builds shared libraries -+and your MakeMaker application links to them, that the absolute paths of the -+libraries in the build tree will be inserted into the RPATH header of all -+MakeMaker generated binaries, and that such binaries will be unable to link -+to these libraries if they do not still reside in the build tree directories -+(unlikely) or in the system library directories (/lib or /usr/lib), regardless -+of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and -+ your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, -+ your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH -+is set to include /some_directory_other_than_usr_lib, because RPATH overrides -+LD_LIBRARY_PATH. -+ -+So for Fedora MakeMaker builds LD_RUN_PATH is NOT generated by default for -+every link. You can still use explicit -rpath ld options or the LD_RUN_PATH -+environment variable during the build to generate an RPATH for the binaries. -+ -+You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command -+line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH -+for every link command. -+ -+USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the -+$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. -+ - =item VENDORPREFIX - - Like PERLPREFIX, but only for the vendor install locations. diff --git a/pkgs/core/perl/patches/perl-5.10.1-utf8-1.patch b/pkgs/core/perl/patches/perl-5.10.1-utf8-1.patch deleted file mode 100644 index bc9580f..0000000 --- a/pkgs/core/perl/patches/perl-5.10.1-utf8-1.patch +++ /dev/null @@ -1,167 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes) -Date: 2010-02-24 -Initial Package Version: 5.10.1 -Upstream Status: From upstream -Origin: Git -http://perl5.git.perl.org/perl.git/patch/0abd0d78a73da1c4d13b1c700526b7e5d03b32d4 -Description: Bug fix for invalid utf-8 characters causing Perl to crash. - -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-3626 - -From 0abd0d78a73da1c4d13b1c700526b7e5d03b32d4 Mon Sep 17 00:00:00 2001 -From: Yves Orton <demerphq(a)gmail.com> -Date: Sun, 25 Oct 2009 20:37:08 +0100 -Subject: [PATCH] disable non-unicode case insensitive trie matching - -Also revert 8902bb05b18c9858efa90229ca1ee42b17277554 as it merely -masked one symptom of the deeper problems. - -Also fixes RT #69973, which was a segfault which was exposed by -8902bb05, see the ticket for further details. - -http://rt.perl.org/rt3//Public/Bug/Display.html?id=69973 - -At the code of this is the problem that in unicode matching a bunch -of code points have case folding rules beyond just A-Z/a-z. Since -the case folding rules are decided at runtime by the string, we cant -use the same TRIE tables for both unicode/non-unicode matching. - -Until this is reconciled or some other solution is found case insensitive -matching only gets the TRIE optimisation when the pattern is uniocde. - -From CaseFolding.txt: - -00B5; C; 03BC; # MICRO SIGN -00C0; C; 00E0; # LATIN CAPITAL LETTER A WITH GRAVE -00C1; C; 00E1; # LATIN CAPITAL LETTER A WITH ACUTE -00C2; C; 00E2; # LATIN CAPITAL LETTER A WITH CIRCUMFLEX -00C3; C; 00E3; # LATIN CAPITAL LETTER A WITH TILDE -00C4; C; 00E4; # LATIN CAPITAL LETTER A WITH DIAERESIS -00C5; C; 00E5; # LATIN CAPITAL LETTER A WITH RING ABOVE -00C6; C; 00E6; # LATIN CAPITAL LETTER AE -00C7; C; 00E7; # LATIN CAPITAL LETTER C WITH CEDILLA -00C8; C; 00E8; # LATIN CAPITAL LETTER E WITH GRAVE -00C9; C; 00E9; # LATIN CAPITAL LETTER E WITH ACUTE -00CA; C; 00EA; # LATIN CAPITAL LETTER E WITH CIRCUMFLEX -00CB; C; 00EB; # LATIN CAPITAL LETTER E WITH DIAERESIS -00CC; C; 00EC; # LATIN CAPITAL LETTER I WITH GRAVE -00CD; C; 00ED; # LATIN CAPITAL LETTER I WITH ACUTE -00CE; C; 00EE; # LATIN CAPITAL LETTER I WITH CIRCUMFLEX -00CF; C; 00EF; # LATIN CAPITAL LETTER I WITH DIAERESIS -00D0; C; 00F0; # LATIN CAPITAL LETTER ETH -00D1; C; 00F1; # LATIN CAPITAL LETTER N WITH TILDE -00D2; C; 00F2; # LATIN CAPITAL LETTER O WITH GRAVE -00D3; C; 00F3; # LATIN CAPITAL LETTER O WITH ACUTE -00D4; C; 00F4; # LATIN CAPITAL LETTER O WITH CIRCUMFLEX -00D5; C; 00F5; # LATIN CAPITAL LETTER O WITH TILDE -00D6; C; 00F6; # LATIN CAPITAL LETTER O WITH DIAERESIS -00D8; C; 00F8; # LATIN CAPITAL LETTER O WITH STROKE -00D9; C; 00F9; # LATIN CAPITAL LETTER U WITH GRAVE -00DA; C; 00FA; # LATIN CAPITAL LETTER U WITH ACUTE -00DB; C; 00FB; # LATIN CAPITAL LETTER U WITH CIRCUMFLEX -00DC; C; 00FC; # LATIN CAPITAL LETTER U WITH DIAERESIS -00DD; C; 00FD; # LATIN CAPITAL LETTER Y WITH ACUTE -00DE; C; 00FE; # LATIN CAPITAL LETTER THORN -00DF; F; 0073 0073; # LATIN SMALL LETTER SHARP S ---- - ext/re/t/regop.t | 12 ++++++------ - regcomp.c | 17 +++++++++++------ - regexec.c | 9 ++------- - 3 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/ext/re/t/regop.t b/ext/re/t/regop.t -index 9118bf6..46e6ec0 100644 ---- a/ext/re/t/regop.t -+++ b/ext/re/t/regop.t -@@ -231,12 +231,12 @@ anchored "ABC" at 0 - #Freeing REx: "(\\.COM|\\.EXE|\\.BAT|\\.CMD|\\.VBS|\\.VBE|\\.JS|\\.JSE|\\."...... - %MATCHED% - floating ""$ at 3..4 (checking floating) --1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0] --stclass EXACTF <.> minlen 3 --Found floating substr ""$ at offset 30... --Does not contradict STCLASS... --Guessed: match at offset 26 --Matching stclass EXACTF <.> against ".exe" -+#1:1[1] 3:2[1] 5:2[64] 45:83[1] 47:84[1] 48:85[0] -+#stclass EXACTF <.> minlen 3 -+#Found floating substr ""$ at offset 30... -+#Does not contradict STCLASS... -+#Guessed: match at offset 26 -+#Matching stclass EXACTF <.> against ".exe" - --- - #Compiling REx "[q]" - #size 12 nodes Got 100 bytes for offset annotations. -diff --git a/regcomp.c b/regcomp.c -index 6e9fa26..eb5f12f 100644 ---- a/regcomp.c -+++ b/regcomp.c -@@ -2833,13 +2833,18 @@ S_study_chunk(pTHX_ RExC_state_t *pRExC_state, regnode **scanp, - } - } else { - /* -- Currently we assume that the trie can handle unicode and ascii -- matches fold cased matches. If this proves true then the following -- define will prevent tries in this situation. -- -- #define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT) --*/ -+ Currently we do not believe that the trie logic can -+ handle case insensitive matching properly when the -+ pattern is not unicode (thus forcing unicode semantics). -+ -+ If/when this is fixed the following define can be swapped -+ in below to fully enable trie logic. -+ - #define TRIE_TYPE_IS_SAFE 1 -+ -+*/ -+#define TRIE_TYPE_IS_SAFE (UTF || optype==EXACT) -+ - if ( last && TRIE_TYPE_IS_SAFE ) { - make_trie( pRExC_state, - startbranch, first, cur, tail, count, -diff --git a/regexec.c b/regexec.c -index 402ede3..ec09c28 100644 ---- a/regexec.c -+++ b/regexec.c -@@ -1105,16 +1105,15 @@ Perl_re_intuit_start(pTHX_ REGEXP * const rx, SV *sv, char *strpos, - - #define REXEC_TRIE_READ_CHAR(trie_type, trie, widecharmap, uc, uscan, len, \ - uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \ -- UV uvc_unfolded = 0; \ - switch (trie_type) { \ - case trie_utf8_fold: \ - if ( foldlen>0 ) { \ -- uvc_unfolded = uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \ -+ uvc = utf8n_to_uvuni( uscan, UTF8_MAXLEN, &len, uniflags ); \ - foldlen -= len; \ - uscan += len; \ - len=0; \ - } else { \ -- uvc_unfolded = uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \ -+ uvc = utf8n_to_uvuni( (U8*)uc, UTF8_MAXLEN, &len, uniflags ); \ - uvc = to_uni_fold( uvc, foldbuf, &foldlen ); \ - foldlen -= UNISKIP( uvc ); \ - uscan = foldbuf + UNISKIP( uvc ); \ -@@ -1140,7 +1139,6 @@ uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \ - uvc = (UV)*uc; \ - len = 1; \ - } \ -- \ - if (uvc < 256) { \ - charid = trie->charmap[ uvc ]; \ - } \ -@@ -1153,9 +1151,6 @@ uvc, charid, foldlen, foldbuf, uniflags) STMT_START { \ - charid = (U16)SvIV(*svpp); \ - } \ - } \ -- if (!charid && trie_type == trie_utf8_fold && !UTF) { \ -- charid = trie->charmap[uvc_unfolded]; \ -- } \ - } STMT_END - - #define REXEC_FBC_EXACTISH_CHECK(CoNd) \ --- -1.6.5.2.74.g610f9.dirty - diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm index 344e291..4610d0d 100644 --- a/pkgs/core/perl/perl.nm +++ b/pkgs/core/perl/perl.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = perl -PKG_VER = 5.10.1 +PKG_VER = 5.12.0 PKG_REL = 0 PKG_MAINTAINER = @@ -50,6 +50,11 @@ endef PKG_TARBALL = $(THISAPP).tar.gz +define QUALITY_AGENT_WHITELIST_RPATH + /lib + /usr/lib +endef + define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH endef @@ -58,7 +63,7 @@ define STAGE_BUILD cd $(DIR_APP) && sed -i -e "s|BUILD_ZLIB\s*= True|BUILD_ZLIB = False|" \ -e "s|INCLUDE\s*= ./zlib-src|INCLUDE = /usr/include|" \ -e "s|LIB\s*= ./zlib-src|LIB = /usr/lib|" \ - ext/Compress-Raw-Zlib/config.in + cpan/Compress-Raw-Zlib/config.in cd $(DIR_APP) && ./configure.gnu -Dprefix=/usr \ -Dman1dir=/usr/share/man/man1 \ @@ -71,4 +76,3 @@ endef define STAGE_TEST cd $(DIR_APP) && make test endef - diff --git a/tools/quality-agent.d/050-nx b/tools/quality-agent.d/050-nx index 7a78a72..febd89f 100755 --- a/tools/quality-agent.d/050-nx +++ b/tools/quality-agent.d/050-nx @@ -5,8 +5,14 @@ function check() { local failed=0 + FILTER="${QUALITY_AGENT_WHITELIST_NX}" + local file for file in $(find_elf_files ${BINARY_PATHS}); do + if filtered ${file}; then + continue + fi + if ! has_nx ${file}; then log_error " No NX: ${file}" failed=1 hooks/post-receive -- IPFire 3.x development tree

1 0

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

11 Apr '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 e843e8adf08b8d11cae9f9b40346d1680c01c180 (commit) from fafba33e8588074092ea302c2ea89c23ba188eab (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 e843e8adf08b8d11cae9f9b40346d1680c01c180 Author: Dirk Wagner <glotzi(a)ipfire.org> Date: Sun Apr 11 22:04:04 2010 +0200 Removed braindead /var/run/pound creation ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/pound | 1 - lfs/pound | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound index a7065c8..45e218b 100644 --- a/config/rootfiles/packages/pound +++ b/config/rootfiles/packages/pound @@ -5,5 +5,4 @@ usr/sbin/poundctl #usr/share/man/man8/pound.8 #usr/share/man/man8/poundctl.8 var/ipfire/backup/addons/includes/pound -#var/run/pound etc/rc.d/init.d/pound diff --git a/lfs/pound b/lfs/pound index 673ba39..39ef2cd 100644 --- a/lfs/pound +++ b/lfs/pound @@ -80,7 +80,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - -mkdir -p /var/run/pound install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \ /var/ipfire/backup/addons/includes/pound @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Apr '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 fafba33e8588074092ea302c2ea89c23ba188eab (commit) from e0dc69faef96155953681c74434bd1ee1b7e8f30 (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 fafba33e8588074092ea302c2ea89c23ba188eab Author: Dirk Wagner <glotzi(a)ipfire.org> Date: Sun Apr 11 21:59:23 2010 +0200 Revert "added /var/run/pound creation" This reverts commit e0dc69faef96155953681c74434bd1ee1b7e8f30. ----------------------------------------------------------------------- Summary of changes: src/paks/pound/install.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) Difference in files: diff --git a/src/paks/pound/install.sh b/src/paks/pound/install.sh index 5e42e48..c1748b0 100644 --- a/src/paks/pound/install.sh +++ b/src/paks/pound/install.sh @@ -29,6 +29,4 @@ ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20pound ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20pound -mkdir -p /var/run/pound - start_service --background ${NAME} hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Apr '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 e0dc69faef96155953681c74434bd1ee1b7e8f30 (commit) from 5c3a57a50de2f6ebd17aada9df5d2baa111827a1 (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 e0dc69faef96155953681c74434bd1ee1b7e8f30 Author: Dirk Wagner <glotzi(a)ipfire.org> Date: Sun Apr 11 20:45:20 2010 +0200 added /var/run/pound creation ----------------------------------------------------------------------- Summary of changes: src/paks/pound/install.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/src/paks/pound/install.sh b/src/paks/pound/install.sh index c1748b0..5e42e48 100644 --- a/src/paks/pound/install.sh +++ b/src/paks/pound/install.sh @@ -29,4 +29,6 @@ ln -svf ../init.d/pound /etc/rc.d/rc0.d/K20pound ln -svf ../init.d/pound /etc/rc.d/rc3.d/S40pound ln -svf ../init.d/pound /etc/rc.d/rc6.d/K20pound +mkdir -p /var/run/pound + start_service --background ${NAME} hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Apr '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 5c3a57a50de2f6ebd17aada9df5d2baa111827a1 (commit) via c3bcec9933d1656307aafc2b7c297c668bd91de6 (commit) via 401d89a036e21cf63f4a7d50e5e3b8e3ebdf58d9 (commit) via 4ad5ead0d9ddfa27c44b500787e9cff2efd645f1 (commit) via 9c4e34b28d045a0a556152b2c6980df623446e3d (commit) via 562e9f63224087b74124fb7631e863f293fc258f (commit) via c1a3a8ed51b34ba1ac559b83b25f3ad7812c18b5 (commit) from 635ba6a5b26678328d500c6dc7ebdbcaeaa71b27 (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 5c3a57a50de2f6ebd17aada9df5d2baa111827a1 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:47:27 2010 +0200 Updated the two qemu packages to the latest stable releases. commit c3bcec9933d1656307aafc2b7c297c668bd91de6 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:47:10 2010 +0200 Updated squidClamav to the latest stable. commit 401d89a036e21cf63f4a7d50e5e3b8e3ebdf58d9 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:45:38 2010 +0200 Revert "Updated qemu and to the latest releases." This w not the qemu commit. This reverts commit 9c4e34b28d045a0a556152b2c6980df623446e3d. commit 4ad5ead0d9ddfa27c44b500787e9cff2efd645f1 Merge: 9c4e34b28d045a0a556152b2c6980df623446e3d 635ba6a5b26678328d500c6dc7ebdbcaeaa71b27 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:45:04 2010 +0200 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit 9c4e34b28d045a0a556152b2c6980df623446e3d Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:44:23 2010 +0200 Updated qemu and to the latest releases. commit 562e9f63224087b74124fb7631e863f293fc258f Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:43:57 2010 +0200 Updated postfix to latest 2.6 stable release. commit c1a3a8ed51b34ba1ac559b83b25f3ad7812c18b5 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 19:43:26 2010 +0200 Updated fetchmail to current stable. ----------------------------------------------------------------------- Summary of changes: doc/packages-list.txt | 10 +++++----- lfs/fetchmail | 7 ++++--- lfs/postfix | 11 ++++------- lfs/qemu | 6 +++--- lfs/qemu-kqemu | 6 +++--- lfs/squidclamav | 6 +++--- 6 files changed, 22 insertions(+), 24 deletions(-) Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c10ee16..1cb425e 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -103,7 +103,7 @@ * fbset-2.1 * fcron-3.0.4 * feedparser-4.1 -* fetchmail-6.3.11 +* fetchmail-6.3.16 * ffmpeg-export-2008-04-13 * file-4.17 * findutils-4.2.27 @@ -268,13 +268,13 @@ * pkg-config-0.20 * popt-1.10.4 * portmap_6.0 -* postfix-2.6.2 +* postfix-2.6.5 * ppp-2.4.4 * pptp-1.7.2 * procps-3.2.6 * psmisc-22.2 -* qemu-0.11.0-kqemu -* qemu-0.12.2 +* qemu-0.11.1-kqemu +* qemu-0.12.3 * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@ -301,7 +301,7 @@ * squashfs-lzma-cvs20100214 * squid-2.7.STABLE9 * squidGuard-1.4.1 -* squidclamav-5.2 +* squidclamav-5.3 * sshfs-fuse-2.2 * sslh-1.7a * streamripper-1.63.5 diff --git a/lfs/fetchmail b/lfs/fetchmail index 4ab1cc0..33b9f9c 100644 --- a/lfs/fetchmail +++ b/lfs/fetchmail @@ -24,7 +24,7 @@ include Config -VER = 6.3.11 +VER = 6.3.16 THISAPP = fetchmail-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = fetchmail -PAK_VER = 5 +PAK_VER = 6 DEPS = "" @@ -44,11 +44,12 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 43b28f296cc0024d3c727319eacae324 +$(DL_FILE)_MD5 = 1a40acb371376c7d54fe468c99dfc216 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) diff --git a/lfs/postfix b/lfs/postfix index 503f243..bbb9b0c 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -24,7 +24,7 @@ include Config -VER = 2.6.2 +VER = 2.6.5 THISAPP = postfix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 5 +PAK_VER = 6 DEPS = "amavisd mysql" @@ -40,14 +40,11 @@ DEPS = "amavisd mysql" # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - postfix-2.5.5.patch +objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -postfix-2.5.5.patch = $(DL_FROM)/postfix-2.5.5.patch -$(DL_FILE)_MD5 = 1f0edbd521d2b0473626f4d61e8bb4eb -postfix-2.5.5.patch_MD5 = 36cb54665d95016af4ce0cd5f85c20a8 +$(DL_FILE)_MD5 = 6b954cfb3eb6141dac1e773281211717 install : $(TARGET) diff --git a/lfs/qemu b/lfs/qemu index 97d3af3..7925f0d 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ include Config -VER = 0.12.2 +VER = 0.12.3 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = qemu -PAK_VER = 9 +PAK_VER = 10 DEPS = "sdl" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1d7c2d95acb6d0789de86508c608e26d +$(DL_FILE)_MD5 = d215e4568650e8019816397174c090e1 install : $(TARGET) diff --git a/lfs/qemu-kqemu b/lfs/qemu-kqemu index 99b3fe1..a3c99b4 100644 --- a/lfs/qemu-kqemu +++ b/lfs/qemu-kqemu @@ -24,7 +24,7 @@ include Config -VER = 0.11.0 +VER = 0.11.1 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-kqemu PROG = qemu-kqemu -PAK_VER = 1 +PAK_VER = 2 DEPS = "sdl qemu" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4da6a3e926a0260902f0dee342a59c23 +$(DL_FILE)_MD5 = 193285b0bcf655a7f7577d05ffcb82b1 install : $(TARGET) diff --git a/lfs/squidclamav b/lfs/squidclamav index 68d5f6a..9c37753 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -24,7 +24,7 @@ include Config -VER = 5.2 +VER = 5.3 THISAPP = squidclamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 10 +PAK_VER = 11 DEPS = "clamav" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7f8d48962f139f747fa9b2050ede19a3 +$(DL_FILE)_MD5 = 39f4b98294782039840b2052eab543e2 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Apr '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 635ba6a5b26678328d500c6dc7ebdbcaeaa71b27 (commit) from bc5c86e4811b69730b1fd6457f76dbea45b45b3c (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 635ba6a5b26678328d500c6dc7ebdbcaeaa71b27 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 11 13:29:36 2010 +0200 Add squid and squidguard to core38 updater. ----------------------------------------------------------------------- Summary of changes: .../{oldcore/32 => core/38}/filelists/squid | 0 config/rootfiles/core/38/filelists/squidguard | 1 + config/rootfiles/core/38/update.sh | 9 +++++++++ 3 files changed, 10 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/32 => core/38}/filelists/squid (100%) create mode 120000 config/rootfiles/core/38/filelists/squidguard Difference in files: diff --git a/config/rootfiles/core/38/filelists/squid b/config/rootfiles/core/38/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/38/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/38/filelists/squidguard b/config/rootfiles/core/38/filelists/squidguard new file mode 120000 index 0000000..f87a5b0 --- /dev/null +++ b/config/rootfiles/core/38/filelists/squidguard @@ -0,0 +1 @@ +../../../common/squidguard \ No newline at end of file diff --git a/config/rootfiles/core/38/update.sh b/config/rootfiles/core/38/update.sh index 943c387..769ba15 100644 --- a/config/rootfiles/core/38/update.sh +++ b/config/rootfiles/core/38/update.sh @@ -66,6 +66,11 @@ rm -rf /lib/modules/*-ipfire # # +# Stop Sevices +# +/etc/init.d/squid stop + +# # Backup grub.conf # cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org @@ -133,6 +138,10 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Todo convert ipsec.conf from open to strongswan... # # +# Start Sevices +# +/etc/init.d/squid start +# # Delete old lm-sensor modullist... # rm -rf /etc/sysconfig/lm_sensors hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Apr '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 bc5c86e4811b69730b1fd6457f76dbea45b45b3c (commit) via e9007fefa0ab55f163ea5b518e4497354032741f (commit) via e12bc37dca92fb3c92cde6e1585cb85471d23c78 (commit) via cee03fd1d4de8c9435b4c9d0811d61ec4c9d8b68 (commit) from f90eb01ebb87ff25f4fca4ea878b610960ced8b9 (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 bc5c86e4811b69730b1fd6457f76dbea45b45b3c Merge: e9007fefa0ab55f163ea5b518e4497354032741f f90eb01ebb87ff25f4fca4ea878b610960ced8b9 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 09:07:58 2010 +0200 Merge branch 'master' of git://git.ipfire.org/ipfire-2.x commit e9007fefa0ab55f163ea5b518e4497354032741f Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 09:07:13 2010 +0200 Fixed url filter repository for local redirects. This fixes bug #0000613 commit e12bc37dca92fb3c92cde6e1585cb85471d23c78 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 09:06:37 2010 +0200 Updated samba to current stable. This fixes bug #0000615 commit cee03fd1d4de8c9435b4c9d0811d61ec4c9d8b68 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Sun Apr 11 09:05:32 2010 +0200 Updated squid to current stable. This fixes bug #0000616 ----------------------------------------------------------------------- Summary of changes: config/httpd/vhosts.d/ipfire-interface.conf | 19 +++++++++++++------ config/rootfiles/common/squidguard | 3 ++- doc/packages-list.txt | 5 +++-- html/cgi-bin/urlfilter.cgi | 2 +- lfs/samba | 6 +++--- lfs/squid | 8 ++++---- lfs/squidguard | 4 ++-- 7 files changed, 28 insertions(+), 19 deletions(-) Difference in files: diff --git a/config/httpd/vhosts.d/ipfire-interface.conf b/config/httpd/vhosts.d/ipfire-interface.conf index bf55b2b..b55b80f 100644 --- a/config/httpd/vhosts.d/ipfire-interface.conf +++ b/config/httpd/vhosts.d/ipfire-interface.conf @@ -51,11 +51,18 @@ Require user dial admin </Directory> Alias /updatecache/ /var/updatecache/ -<Directory /var/updatecache> - Options ExecCGI - AllowOverride None - Order deny,allow - Allow from all -</Directory> + <Directory /var/updatecache> + Options ExecCGI + AllowOverride None + Order deny,allow + Allow from all + </Directory> + Alias /repository/ /var/urlrepo/ + <Directory /var/urlrepo> + Options ExecCGI + AllowOverride None + Order deny,allow + Allow from all + </Directory> </VirtualHost> diff --git a/config/rootfiles/common/squidguard b/config/rootfiles/common/squidguard index 8e8509c..a6bab0c 100644 --- a/config/rootfiles/common/squidguard +++ b/config/rootfiles/common/squidguard @@ -1,6 +1,5 @@ #etc/squidGuard etc/squidGuard/squidGuard.conf -srv/web/ipfire/html/repository usr/bin/squidGuard usr/sbin/redirect_wrapper #usr/squidGuard @@ -80,3 +79,5 @@ var/ipfire/urlfilter/version var/lib/squidguard #var/log/squidGuard var/log/squidGuard/squidGuard.log +var/urlrepo + diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 07732ab..c10ee16 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -62,6 +62,7 @@ * cacti-0.8.7e * calamaris-2.59 * capi4k-utils-2005-07-18 +* ccache-2.4 * ccache-3.0pre0 * cdrtools-2.01.01 * centerim-4.22.1 @@ -282,7 +283,7 @@ * rssdler-0.4.0a * rsync-3.0.7 * rtorrent-0.8.6 -* samba-3.5.1 +* samba-3.5.2 * sane-1.0.19 * screen-4.0.3 * sdparm-1.01 @@ -298,7 +299,7 @@ * splix-2.0.0-rc2 * sqlite-3.6.10 * squashfs-lzma-cvs20100214 -* squid-2.7.STABLE7 +* squid-2.7.STABLE9 * squidGuard-1.4.1 * squidclamav-5.2 * sshfs-fuse-2.2 diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 2d180e2..6e99397 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -59,7 +59,7 @@ my $tcfile = "${General::swroot}/urlfilter/timeconst"; my $uqfile = "${General::swroot}/urlfilter/userquota"; my $dbdir = "${General::swroot}/urlfilter/blacklists"; my $editdir = "${General::swroot}/urlfilter/editor"; -my $repository = "/home/httpd/html/repository"; +my $repository = "/var/urlrepo"; my $hintcolour = '#FFFFCC'; my $sourceurlfile = "${General::swroot}/urlfilter/autoupdate/autoupdate.urls"; diff --git a/lfs/samba b/lfs/samba index a5fd0ad..19941f5 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.1 +VER = 3.5.2 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 25 +PAK_VER = 26 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 60811195b0507fa151b602684cece743 +$(DL_FILE)_MD5 = 6f8cf649207ccd8c2c17e28c335f4e9d install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index f895307..3a5e265 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,10 +24,10 @@ include Config -VER = 2.7.STABLE7 +VER = 2.7.STABLE9 THISAPP = squid-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c18b0371fca813d5e7c7e0baf87baa22 +$(DL_FILE)_MD5 = 7d3b8b0bdda3ae56e438d4a95a97d3b3 install : $(TARGET) @@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls \ --datadir=/usr/lib/squid \ diff --git a/lfs/squidguard b/lfs/squidguard index 5b2656c..a5dd7b9 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make install # URL-Filter - -mkdir /etc/squidGuard /srv/web/ipfire/html/repository + -mkdir /etc/squidGuard /var/urlrepo cp -f $(DIR_CONF)/urlfilter/autoupdate.urls /var/ipfire/urlfilter/autoupdate/autoupdate.urls ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.daily ln -fs /bin/false /var/ipfire/urlfilter/autoupdate/cron.weekly @@ -102,7 +102,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown -R nobody:nobody /var/ipfire/urlfilter chmod 755 /srv/web/ipfire/html/images/urlfilter chmod 644 /srv/web/ipfire/html/images/urlfilter/* - chown -R nobody:nobody /srv/web/ipfire/html/repository + chown -R nobody:nobody /var/urlrepo chown -R squid:squid /var/log/squidGuard @rm -rf $(DIR_APP) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b9f102b03c8ec311f309b10b583f956ff8a4a7c6
by git＠ipfire.org 10 Apr '10

10 Apr '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 b9f102b03c8ec311f309b10b583f956ff8a4a7c6 (commit) via 6f1ca1a1b0417c3def754e44e930782299cf7585 (commit) from f31406a9de231da58fd530c364dece3a80a5fc36 (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 b9f102b03c8ec311f309b10b583f956ff8a4a7c6 Merge: 6f1ca1a1b0417c3def754e44e930782299cf7585 f31406a9de231da58fd530c364dece3a80a5fc36 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Apr 11 01:04:04 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 6f1ca1a1b0417c3def754e44e930782299cf7585 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Apr 10 23:15:15 2010 +0200 lsof: lsof is for root use only. ----------------------------------------------------------------------- Summary of changes: pkgs/core/lsof/lsof.nm | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/core/lsof/lsof.nm b/pkgs/core/lsof/lsof.nm index 3c87f89..f2a1f14 100644 --- a/pkgs/core/lsof/lsof.nm +++ b/pkgs/core/lsof/lsof.nm @@ -45,12 +45,16 @@ PKG_TARBALL = $(PKG_NAME)_$(PKG_VER)_src.tar.gz DIR_APP = /usr/src/$(PKG_NAME)_$(PKG_VER)_src define STAGE_BUILD - cd $(DIR_APP) && ./Configure linux -n + cd $(DIR_APP) && \ + LINUX_BASE=/proc \ + LSOF_VSTR="2.6.16" \ + ./Configure linux -n cd $(DIR_APP) && make DEBUG="$(CFLAGS)" $(PARALLELISMFLAGS) endef define STAGE_INSTALL - -mkdir -pv $(BUILDROOT)/usr/bin - cd $(DIR_APP) && install -m 4750 -o root -g nobody lsof $(BUILDROOT)/usr/bin + -mkdir -pv $(BUILDROOT)/usr/sbin + cd $(DIR_APP) && install -m 755 lsof $(BUILDROOT)/usr/sbin + -mkdir -pv $(BUILDROOT)/usr/share/man/man8 + cd $(DIR_APP) && cp -vf lsof.8 $(BUILDROOT)/usr/share/man/man8 endef - hooks/post-receive -- IPFire 3.x development tree

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2010