IPFire-SCM April 2013

ipfire-scm@lists.ipfire.org

1 participants
35 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d7ae74183727a8f5ee99d151610099ec8ea9851d
by git＠ipfire.org 09 Apr '13

09 Apr '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 d7ae74183727a8f5ee99d151610099ec8ea9851d (commit) via 0cf124ab691a5502923ef69627b96069580861da (commit) via ff7aaa0721a4df126086e7b27be1519f2ab93255 (commit) via 35275bcd26cc471ae47b60e820366418f25d7823 (commit) via a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79 (commit) from 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec (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 d7ae74183727a8f5ee99d151610099ec8ea9851d Merge: 49c7a4b 0cf124a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 9 12:41:40 2013 +0200 Merge branch 'strongswan-next' into next commit 0cf124ab691a5502923ef69627b96069580861da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 8 14:42:44 2013 +0200 ipsec: Set IKE/IPsec lifetime to strongswan defaults. As suggested by Tom Rymes: https://bugzilla.ipfire.org/show_bug.cgi?id=10346 commit ff7aaa0721a4df126086e7b27be1519f2ab93255 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 5 11:20:31 2013 +0200 Add strongswan update to core update 68. commit 35275bcd26cc471ae47b60e820366418f25d7823 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 5 11:19:54 2013 +0200 strongswan: Update to 5.0.3. commit a3b3340bcca61cd0d0c5bc0d2e094c91c8226e79 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Mar 28 17:09:35 2013 +0100 strongswan: Update to 5.0.3rc1. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/38 => core/68}/filelists/strongswan | 0 html/cgi-bin/vpnmain.cgi | 4 ++-- lfs/strongswan | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) copy config/rootfiles/{oldcore/38 => core/68}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/core/68/filelists/strongswan b/config/rootfiles/core/68/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/68/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 161df4d..bda49a3 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -1832,11 +1832,11 @@ END $cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18]; $cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19]; $cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20]; - $cgiparams{'IKE_LIFETIME'} = '1'; #[16]; + $cgiparams{'IKE_LIFETIME'} = '3'; #[16]; $cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21]; $cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22]; $cgiparams{'ESP_GROUPTYPE'} = ''; #[23]; - $cgiparams{'ESP_KEYLIFE'} = '8'; #[17]; + $cgiparams{'ESP_KEYLIFE'} = '1'; #[17]; $cgiparams{'COMPRESSION'} = 'on'; #[13]; $cgiparams{'ONLY_PROPOSED'} = 'off'; #[24]; $cgiparams{'PFS'} = 'on'; #[28]; diff --git a/lfs/strongswan b/lfs/strongswan index 8e75329..1b7877c 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,10 +24,10 @@ include Config -VER = 5.0.2 +VER = 5.0.3 THISAPP = strongswan-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef +$(DL_FILE)_MD5 = c37d841f8b0d11b14cf7f29fcdd20621 install : $(TARGET) @@ -75,7 +75,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 axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec
by git＠ipfire.org 07 Apr '13

07 Apr '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 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec (commit) from 7e4a0896637b38cb37c3bdca6984f397fc9b16a7 (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 49c7a4b8284bbf03019f7b1565ac7d55ba2eacec Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Apr 7 10:06:15 2013 +0200 transmission: update to 2.77. ----------------------------------------------------------------------- Summary of changes: lfs/transmission | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/transmission b/lfs/transmission index ab34ee3..083db58 100644 --- a/lfs/transmission +++ b/lfs/transmission @@ -24,7 +24,7 @@ include Config -VER = 2.76 +VER = 2.77 THISAPP = transmission-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = transmission -PAK_VER = 5 +PAK_VER = 6 DEPS = "libevent2" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9abbffe29ce9b5ee68a116d293c51111 +$(DL_FILE)_MD5 = 60c0e77a1852656215f7102a437b2a3d install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7e4a0896637b38cb37c3bdca6984f397fc9b16a7
by git＠ipfire.org 06 Apr '13

06 Apr '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 7e4a0896637b38cb37c3bdca6984f397fc9b16a7 (commit) from 7f88a71f90f733c2004bcaeeb9633fc51d2b049a (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 7e4a0896637b38cb37c3bdca6984f397fc9b16a7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 6 15:09:57 2013 +0200 initrd: fix net and hid modules at installer. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/installer/hid-modules | 1 - config/rootfiles/installer/network-modules | 1 - lfs/initrd | 6 ++++++ 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 config/rootfiles/installer/hid-modules delete mode 100644 config/rootfiles/installer/network-modules Difference in files: diff --git a/config/rootfiles/installer/hid-modules b/config/rootfiles/installer/hid-modules deleted file mode 100644 index 3b180e9..0000000 --- a/config/rootfiles/installer/hid-modules +++ /dev/null @@ -1 +0,0 @@ -lib/modules/KVER-ipfire/kernel/drivers/hid diff --git a/config/rootfiles/installer/network-modules b/config/rootfiles/installer/network-modules deleted file mode 100644 index 6dabddf..0000000 --- a/config/rootfiles/installer/network-modules +++ /dev/null @@ -1 +0,0 @@ -lib/modules/KVER-ipfire/kernel/drivers/net diff --git a/lfs/initrd b/lfs/initrd index 7403644..56e1967 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -64,6 +64,12 @@ $(TARGET) : -cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES + # Copy hid and network modules + cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \ + /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/ + cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \ + /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/ + cd /install/initrd/etc && rm -f fstab cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/ rm -rf /install/initrd/usr/share/man hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d8a39ab26d44eef2bc7a177fb9bb85610e690139
by git＠ipfire.org 01 Apr '13

01 Apr '13

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. f2dfd5778e2494e16376ef4535422d3d17783370
by git＠ipfire.org 01 Apr '13

01 Apr '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 3.x development tree". The branch, master has been updated via f2dfd5778e2494e16376ef4535422d3d17783370 (commit) from 5f4bab7077947a4695744fdbf4c0c3b19ae7fe13 (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 f2dfd5778e2494e16376ef4535422d3d17783370 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 31 20:50:24 2013 +0200 openldap: Enable ldaps on default. * Enable ldaps at default. * Add a script to generate the required certificates. ----------------------------------------------------------------------- Summary of changes: openldap/ldapcert.sh | 34 ++++++++++++++++++++++++++++++++++ openldap/openldap-conf.ldif | 4 ++-- openldap/openldap.nm | 13 +++++++++++-- openldap/systemd/openldap.service | 3 ++- 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 openldap/ldapcert.sh Difference in files: diff --git a/openldap/ldapcert.sh b/openldap/ldapcert.sh new file mode 100644 index 0000000..614a8b9 --- /dev/null +++ b/openldap/ldapcert.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# This is a temporary script to generate a self-signet certificate for the openLDAP service. +# +LDAPCERTDIR=/etc/openldap/certs + +# Check if a server key allready exists. +if [ ! -f $LDAPCERTDIR/server.key ]; then + echo "Generating openLDAP server key." + openssl genrsa -out $LDAPCERTDIR/server.key 2048 + + # Fix ownership and permissions. + chown ldap:ldap $LDAPCERTDIR/server.key + chmod 0600 $LDAPCERTDIR/server.key +fi + +# Check if the certificate allready exists. +if [ ! -f $LDAPCERTDIR/server.pem ]; then + echo "Generating CSR" + openssl req -new -key $LDAPCERTDIR/server.key \ + -out $LDAPCERTDIR/server.csr + + echo "Signing certificate" + openssl x509 -req -days 365 -in \ + $LDAPCERTDIR/server.csr -signkey $LDAPCERTDIR/server.key \ + -out $LDAPCERTDIR/server.pem + + # Remove unneeded csr file. + rm -rvf $LDAPCERTDIR/server.csr + + # Fix ownership and file permissions. + chown ldap:ldap $LDAPCERTDIR/server.pem + chmod 0600 $LDAPCERTDIR/server.pem +fi diff --git a/openldap/openldap-conf.ldif b/openldap/openldap-conf.ldif index a34fa04..c660434 100644 --- a/openldap/openldap-conf.ldif +++ b/openldap/openldap-conf.ldif @@ -11,8 +11,8 @@ olcPidFile: /run/openldap/slapd.pid # TLS settings # #olcTLSCACertificateFile: /etc/pki/CA/cacert.pem -#olcTLSCertificateFile: /etc/openldap/certs/server.pem -#olcTLSCertificateKeyFile: /etc/openldap/certs/server.pem +olcTLSCertificateFile: /etc/openldap/certs/server.pem +olcTLSCertificateKeyFile: /etc/openldap/certs/server.key # # Do not enable referrals until AFTER you have a working directory # service AND an understanding of referrals. diff --git a/openldap/openldap.nm b/openldap/openldap.nm index a0fdd96..2588061 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -5,7 +5,7 @@ name = openldap version = 2.4.32 -release = 4 +release = 5 groups = System/Daemons url = http://www.openldap.org/ @@ -84,8 +84,13 @@ build cp -vf %{DIR_SOURCE}/openldap-conf.ldif \ %{BUILDROOT}%{datadir}/%{name}/ + # Install ldapcert.sh script. + install -m 0755 %{DIR_SOURCE}/ldapcert.sh \ + %{BUILDROOT}%{datadir}/%{name}/ + # Create directoires. mkdir -pv %{BUILDROOT}%{sysconfdir}/%{name}/slapd.d + mkdir -pv %{BUILDROOT}%{sysconfdir}/%{name}/certs mkdir -pv %{BUILDROOT}/run/%{name} mkdir -pv %{BUILDROOT}%{sharedstatedir}/ldap @@ -105,7 +110,10 @@ end packages package %{name} - prerequires += shadow-utils + prerequires + openssl + shadow-utils + end script prein %{create_user} @@ -113,6 +121,7 @@ packages datafiles %{sysconfdir}/%{name}/slapd.d + %{sysconfdir}/%{name}/certs %{sharedstatedir}/ldap end diff --git a/openldap/systemd/openldap.service b/openldap/systemd/openldap.service index a6960d3..c21bd3a 100644 --- a/openldap/systemd/openldap.service +++ b/openldap/systemd/openldap.service @@ -3,4 +3,5 @@ Description=OpenLDAP After=basic.target sockets.target [Service] -ExecStart=/usr/sbin/slapd -u ldap -h 'ldapi://' +Type=forking +ExecStart=/usr/sbin/slapd -u ldap -h 'ldapi:// ldaps://' hooks/post-receive -- IPFire 3.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2013