IPFire-SCM May 2013

ipfire-scm@lists.ipfire.org

1 participants
44 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a9a58c609a4533ace92ae51e7e3e991a5409e97c
by git＠ipfire.org 08 May '13

08 May '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 96b397c47106189c2670560ace4a805e6adc1bb5
by git＠ipfire.org 06 May '13

06 May '13

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c6556649c67e7cadfb16cb91c5c75534acc336b0
by git＠ipfire.org 04 May '13

04 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c6556649c67e7cadfb16cb91c5c75534acc336b0 (commit) from ada69e1271313afb3124c97427bedec9759fb913 (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 c6556649c67e7cadfb16cb91c5c75534acc336b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 4 20:33:15 2013 +0200 openvpn: Rewrite the vertificate verify script in perl. The current shell implementation is not strict with the certificate common names and does not check all the requirements for the connection to be accepted. ----------------------------------------------------------------------- Summary of changes: config/ovpn/verify | 70 ++++++++++++++++++++++++++------ config/rootfiles/core/68/filelists/files | 1 + 2 files changed, 59 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/ovpn/verify b/config/ovpn/verify index 8fbe59e..7233429 100644 --- a/config/ovpn/verify +++ b/config/ovpn/verify @@ -1,12 +1,58 @@ -#!/bin/sh -if [ $1 -eq 0 ]; then - name2=`echo $2` - name3=${name2##*/} - name4=${name3##*CN=} - clientdisabled=`/bin/grep -iwc off,.*,$name4 /var/ipfire/ovpn/ovpnconfig` - if [ "$clientdisabled" = "1" ]; then - exit 1 - fi - exit 0 -fi -exit 0 +#!/usr/bin/perl +############################################################################ +# # +# 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 2 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) 2013 IPFire Team <info(a)ipfire.org>. # +# # +############################################################################ + +require '/var/ipfire/general-functions.pl'; + +my $DEPTH = $ARGV[0]; +my $CN = $ARGV[1]; + +# Exit immediately for every certificate depth other than 0. +exit 0 unless ($DEPTH eq "0"); + +# Strip the CN from the X509 identifier. +$CN =~ /\/CN=(.*)$/i; +$CN = $1; + +my %confighash = (); +if (-f "${General::swroot}/ovpn/ovpnconfig"){ + &General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash); + foreach my $key (keys %confighash) { + my $cn = $confighash{$key}[2]; + + # Skip disabled connections. + next unless ($confighash{$key}[0] eq "on"); + + # Skip non-roadwarrior connections. + next unless ($confighash{$key}[3] eq "host"); + + # Search for a matching CN. + exit 0 if ($cn eq $CN); + + # Compatibility code for incorrectly saved CNs. + $cn =~ s/\ /_/; + exit 0 if ($cn eq $CN); + } +} + +# Return an error if ovpnconfig could not be found. +exit 1; diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 65e46ae..c96e7cf 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -44,3 +44,4 @@ var/ipfire/backup/include var/ipfire/header.pl var/ipfire/general-functions.pl var/ipfire/langs +var/ipfire/ovpn/verify hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ada69e1271313afb3124c97427bedec9759fb913
by git＠ipfire.org 03 May '13

03 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via ada69e1271313afb3124c97427bedec9759fb913 (commit) from 4ac2d1561a07c8188644825cc303a95dda16ae67 (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 ada69e1271313afb3124c97427bedec9759fb913 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri May 3 17:10:16 2013 +0200 sysbench: New package. A tool for performance benchmarks. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/sysbench | 1 + lfs/{stress => sysbench} | 13 ++++++++----- make.sh | 1 + 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 config/rootfiles/packages/sysbench copy lfs/{stress => sysbench} (86%) Difference in files: diff --git a/config/rootfiles/packages/sysbench b/config/rootfiles/packages/sysbench new file mode 100644 index 0000000..3164256 --- /dev/null +++ b/config/rootfiles/packages/sysbench @@ -0,0 +1 @@ +usr/bin/sysbench diff --git a/lfs/sysbench b/lfs/sysbench new file mode 100644 index 0000000..b6e008e --- /dev/null +++ b/lfs/sysbench @@ -0,0 +1,72 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.4.12 + +THISAPP = sysbench-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sysbench +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 3a6d54fdd3fe002328e4458206392b9d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && touch AUTHORS NEWS + cd $(DIR_APP) && autoreconf -vfi + cd $(DIR_APP) && ./configure --prefix=/usr --without-mysql + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + rm -rvf /usr/share/doc/sysbench + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8a2d4f8..8ed09d6 100755 --- a/make.sh +++ b/make.sh @@ -764,6 +764,7 @@ buildipfire() { ipfiremake avahi ipfiremake nginx ipfiremake sendEmail + ipfiremake sysbench echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild 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 May 2013