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, pakfire3 has been updated via c61e145e6f55763b4a5c3aa480aba01b76fa0e35 (commit) via 38b0ebbc9d8bb67c1a248192dea3b2b650e1291e (commit) via 83371d5f5705ca1605343f53c02588083a95d392 (commit) from ac073fba8c61fa675f7144523c26de3f55c01eac (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 c61e145e6f55763b4a5c3aa480aba01b76fa0e35 Merge: ac073fb 38b0ebb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 9 22:47:39 2011 +0200

Merge branch 'master' into pakfire3

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/49/filelists/files | 1 + html/cgi-bin/vpnmain.cgi | 6 +++--- lfs/libsatsolver | 9 ++++++++- 3 files changed, 12 insertions(+), 4 deletions(-)

Difference in files: diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index bac8769..032958b 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -10,6 +10,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl var/ipfire/langs/en.pl var/ipfire/langs/es.pl diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 5558295..76b408d 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1383,15 +1383,15 @@ END

# Allow nothing or a string (DN,FDQN,) beginning with @ # with no comma but slashes between RID eg @O=FR/C=Paris/OU=myhome/CN=franck - if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d.\d.\d.\d)$/) || - ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d.\d.\d.\d)$/) || + if ( ($cgiparams{'LOCAL_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d+.\d+.\d+.\d+)$/) || + ($cgiparams{'REMOTE_ID'} !~ /^(|[\w.-]*@[\w. =*/-]+|\d+.\d+.\d+.\d+)$/) || (($cgiparams{'REMOTE_ID'} eq $cgiparams{'LOCAL_ID'}) && ($cgiparams{'LOCAL_ID'} ne '')) ) { $errormessage = $Lang::tr{'invalid local-remote id'} . '<br />' . 'DER_ASN1_DN: @c=FR/ou=Paris/ou=Home/cn=*<br />' . 'FQDN: @ipfire.org<br />' . 'USER_FQDN: info@ipfire.org<br />' . - 'IPV4_ADDR: @123.123.123.123'; + 'IPV4_ADDR: 123.123.123.123'; goto VPNCONF_ERROR; } # If Auth is DN, verify existance of Remote ID. diff --git a/lfs/libsatsolver b/lfs/libsatsolver index 619c477..771430b 100644 --- a/lfs/libsatsolver +++ b/lfs/libsatsolver @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team info@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 # @@ -32,6 +32,10 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)

+PROG = libsatsolver +DEPS = "" +PAK_VER = 1 + ############################################################################### # Top-level Rules ############################################################################### @@ -50,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

md5 : $(subst %,%_MD5,$(objects))

+dist : + @$(PAK) + ############################################################################### # Downloading, checking, md5sum ###############################################################################

hooks/post-receive -- IPFire 2.x development tree