IPFire-SCM March 2012

ipfire-scm@lists.ipfire.org

1 participants
62 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6826896546f7df243ceaea527ecd4df465d6bb0c
by git＠ipfire.org 12 Mar '12

12 Mar '12

1 0

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

12 Mar '12

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 3e76909a2ea734614f2d94616ad959e21f4a3a7a (commit) via 48e44b02fac7c978235c40c28b17cf1bfcf73039 (commit) from ab1d9166265e50427c6fa314f913aaf777d8050f (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 3e76909a2ea734614f2d94616ad959e21f4a3a7a Merge: ab1d916 48e44b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 12 10:13:50 2012 +0100 Merge remote-tracking branch 'stevee/openldap' commit 48e44b02fac7c978235c40c28b17cf1bfcf73039 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 11 20:30:32 2012 +0100 openldap: Update to 2.4.30. ----------------------------------------------------------------------- Summary of changes: openldap/openldap.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/openldap/openldap.nm b/openldap/openldap.nm index c6bfb7e..fef3ca5 100644 --- a/openldap/openldap.nm +++ b/openldap/openldap.nm @@ -4,8 +4,8 @@ ############################################################################### name = openldap -version = 2.4.28 -release = 2 +version = 2.4.30 +release = 1 groups = System/Daemons url = http://www.openldap.org/ hooks/post-receive -- IPFire 3.x development tree

1 0

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

12 Mar '12

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 ab1d9166265e50427c6fa314f913aaf777d8050f (commit) from e78de92e15c1bb378e6447cf8b7131e491b00b29 (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 ab1d9166265e50427c6fa314f913aaf777d8050f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 12 10:08:31 2012 +0100 syslinux: This package is only supported on x86 architectures. ----------------------------------------------------------------------- Summary of changes: syslinux/syslinux.nm | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Difference in files: diff --git a/syslinux/syslinux.nm b/syslinux/syslinux.nm index c5897c6..b24d7cb 100644 --- a/syslinux/syslinux.nm +++ b/syslinux/syslinux.nm @@ -5,7 +5,8 @@ name = syslinux version = 4.02 -release = 2 +release = 3 +sup_arches = x86_64 i686 groups = System/Boot url = http://syslinux.zytor.com/ hooks/post-receive -- IPFire 3.x development tree

1 0

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

11 Mar '12

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 e78de92e15c1bb378e6447cf8b7131e491b00b29 (commit) via 40c54876556beb130f2f17211a69a23d5be9587a (commit) via a5d9074a463a3c13e46784a0b1e0e7a548027c97 (commit) from 47902c21be198525dc2ebe7f4caed1c6d2497346 (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 e78de92e15c1bb378e6447cf8b7131e491b00b29 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Mar 12 00:22:18 2012 +0100 openssh: Some bigger changes. Adopts systemd files from Fedora and cleans up a lot in the makefile. commit 40c54876556beb130f2f17211a69a23d5be9587a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 11 23:42:07 2012 +0100 grubby: Update to version 8.9. Fixes #10059, #10062. commit a5d9074a463a3c13e46784a0b1e0e7a548027c97 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 11 23:41:39 2012 +0100 samba: Make package compile on x86_64. ----------------------------------------------------------------------- Summary of changes: grubby/grubby.nm | 16 +++- openssh/openssh.nm | 139 ++++++++++++++++++++++------------- openssh/ssh-keygen | 8 -- openssh/sshd-keygen | 63 ++++++++++++++++ openssh/sshd.pam | 20 +++-- openssh/systemd/openssh.service | 12 --- openssh/systemd/sshd-keygen.service | 12 +++ openssh/systemd/sshd.service | 10 +++ openssh/systemd/sshd.socket | 10 +++ openssh/systemd/sshd@.service | 8 ++ samba/samba.nm | 26 +++--- 11 files changed, 230 insertions(+), 94 deletions(-) delete mode 100644 openssh/ssh-keygen create mode 100644 openssh/sshd-keygen delete mode 100644 openssh/systemd/openssh.service create mode 100644 openssh/systemd/sshd-keygen.service create mode 100644 openssh/systemd/sshd.service create mode 100644 openssh/systemd/sshd.socket create mode 100644 openssh/systemd/sshd@.service Difference in files: diff --git a/grubby/grubby.nm b/grubby/grubby.nm index 92c1a58..830f27d 100644 --- a/grubby/grubby.nm +++ b/grubby/grubby.nm @@ -4,7 +4,7 @@ ############################################################################### name = grubby -version = 8.3 +version = 8.9 release = 1 groups = System/Base @@ -20,7 +20,8 @@ description environment. end -sources = %{thisapp}.tar.bz2 +# Source tarballs must be generated from git. +sources = %{thisapp}.tar.bz2 build requires @@ -34,11 +35,20 @@ build make test end - make_install_targets += mandir=/usr/share/man + make_install_targets += mandir=%{mandir} end packages package %{name} + # Pull in uboot-tools on ARM platforms. + if "%{DISTRO_ARCH}" == "armv7hl" + requires += uboot-tools + end + + if "%{DISTRO_ARCH}" == "armv5tel" + requires += uboot-tools + end + end package %{name}-debuginfo template DEBUGINFO diff --git a/openssh/openssh.nm b/openssh/openssh.nm index 0b0250c..d04d2b2 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -5,7 +5,7 @@ name = openssh version = 5.9p1 -release = 3 +release = 4 groups = Application/Internet url = http://www.openssh.com/portable.html @@ -26,10 +26,14 @@ build audit-devel autoconf automake + groff + libedit-devel libselinux-devel - nss-devel - openssl-devel>=1.0.0d-2 + ncurses-devel + openldap-devel + openssl-devel >= 1.0.0d-2 pam-devel + util-linux zlib-devel end @@ -67,17 +71,25 @@ build end configure_options += \ - --sysconfdir=/etc/ssh \ - --datadir=/usr/share/sshd \ - --libexecdir=/usr/lib/openssh \ - --with-md5-passwords \ - --with-privsep-path=/var/lib/sshd \ + --sysconfdir=%{sysconfdir}/ssh \ + --datadir=%{datadir}/sshd \ + --libexecdir=%{libdir}/openssh \ + --with-default-path=/usr/local/bin:/bin:/usr/bin \ + --with-superuser-path=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin \ + --with-privsep-path=/var/empty/sshd \ + --enable-vendor-patchlevel="%{DISTRO_NAME} %{thisver}" \ + --disable-strip \ + --with-ssl-engine \ + --with-authorized-keys-command \ + --with-ipaddr-display \ + --with-ldap \ --with-pam \ + --with-libedit \ --with-selinux \ --with-audit=linux prepare_cmds - autoreconf + autoreconf -vfi end install_cmds @@ -85,15 +97,32 @@ build sed -e "s/^.*GSSAPIAuthentication/#&/" -i %{BUILDROOT}/etc/ssh/ssh_config # Install scriptfile for key generation - install -m 754 %{DIR_SOURCE}/ssh-keygen %{BUILDROOT}/usr/lib/openssh/ + mkdir -pv %{BUILDROOT}%{sbindir} + install -m 754 %{DIR_SOURCE}/sshd-keygen %{BUILDROOT}%{sbindir} + + # Install ssh-copy-id. + install -m755 contrib/ssh-copy-id %{BUILDROOT}%{bindir} + install contrib/ssh-copy-id.1 %{BUILDROOT}%{mandir}/man1/ end end packages package openssh + prerequires + shadow-utils + end + requires - openssh-clients=%{thisver} - openssh-server=%{thisver} + openssh-clients = %{thisver} + openssh-server = %{thisver} + end + + configfiles + %{sysconfdir}/ssh/moduli + end + + script prein + getent group sshd_keys >/dev/null || groupadd -r ssh_keys || : end end @@ -101,29 +130,33 @@ packages summary = OpenSSH client applications. description = %{summary} + requires = openssh = %{thisver} + files - /etc/ssh/ssh_config - /usr/bin/scp - /usr/bin/sftp - /usr/bin/slogin - /usr/bin/ssh - /usr/bin/ssh-add - /usr/bin/ssh-agent - /usr/bin/ssh-keyscan - /usr/lib/openssh/ssh-pkcs11-helper - /usr/share/man/cat1/scp.1 - /usr/share/man/cat1/sftp.1 - /usr/share/man/cat1/slogin.1 - /usr/share/man/cat1/ssh-add.1 - /usr/share/man/cat1/ssh-agent.1 - /usr/share/man/cat1/ssh-keyscan.1 - /usr/share/man/cat1/ssh.1 - /usr/share/man/cat5/ssh_config.5 - /usr/share/man/cat8/ssh-pkcs11-helper.8 + %{sysconfdir}/ssh/ssh_config + %{bindir}/scp + %{bindir}/sftp + %{bindir}/slogin + %{bindir}/ssh + %{bindir}/ssh-add + %{bindir}/ssh-agent + %{bindir}/ssh-copy-id + %{bindir}/ssh-keyscan + %{libdir}/openssh/ssh-pkcs11-helper + %{mandir}/man1/scp.1* + %{mandir}/man1/sftp.1* + %{mandir}/man1/slogin.1* + %{mandir}/man1/ssh-add.1* + %{mandir}/man1/ssh-agent.1* + %{mandir}/man1/ssh-copy-id.1* + %{mandir}/man1/ssh-keyscan.1* + %{mandir}/man1/ssh.1* + %{mandir}/man5/ssh_config.5* + %{mandir}/man8/ssh-pkcs11-helper.8* end configfiles - /etc/ssh/ssh_config + %{sysconfdir}/ssh/ssh_config end end @@ -131,26 +164,24 @@ packages summary = OpenSSH server applications. description = %{summary} - # /usr/bin/ssh-keygen is needed to generate keys for the ssh server. - requires = /usr/bin/ssh-keygen + requires = openssh = %{thisver} files - /etc/pam.d/sshd - /etc/ssh/moduli - /etc/ssh/sshd_config - /lib/systemd/system/openssh.service - /usr/lib/openssh/sftp-server - /usr/lib/openssh/ssh-keygen - /usr/sbin/sshd - /usr/share/man/cat5/sshd_config.5* - /usr/share/man/cat5/moduli.5* - /usr/share/man/cat8/sshd.8* - /usr/share/man/cat8/sftp-server.8* - /var/lib/sshd + %{sysconfdir}/pam.d/sshd + %{sysconfdir}/ssh/sshd_config + /lib/systemd + %{libdir}/openssh/sftp-server + %{sbindir}/sshd-keygen + %{sbindir}/sshd + %{mandir}/man5/sshd_config.5* + %{mandir}/man5/moduli.5* + %{mandir}/man8/sshd.8* + %{mandir}/man8/sftp-server.8* + /var/empty/sshd end configfiles - /etc/ssh/sshd_config + %{sysconfdir}/ssh/sshd_config end prerequires @@ -160,9 +191,10 @@ packages script prein # Create unprivileged user and group. - getent group sshd || groupadd -r sshd - getent passwd sshd || useradd -r -g sshd \ - -d /var/lib/sshd -s /sbin/nologin sshd + getent group sshd >/dev/null || groupadd -r sshd + getent passwd sshd >/dev/null || useradd -r -g sshd \ + -c "Privilege-separated SSH" \ + -d /var/empty/sshd -s /sbin/nologin sshd end script postin @@ -170,8 +202,10 @@ packages end script preun - /bin/systemctl --no-reload disable openssh.service >/dev/null 2>&1 || : - /bin/systemctl stop openssh.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable sshd.service >/dev/null 2>&1 || : + /bin/systemctl --no-reload disable sshd-keygen.service >/dev/null 2>&1 || : + /bin/systemctl stop sshd.service >/dev/null 2>&1 || : + /bin/systemctl stop sshd-keygen.service >/dev/null 2>&1 || : end script postun @@ -180,6 +214,9 @@ packages script postup /bin/systemctl daemon-reload >/dev/null 2>&1 || : + + /bin/systemctl try-restart sshd.service >/dev/null 2>&1 || : + /bin/systemctl try-restart sshd-keygen.service >/dev/null 2>&1 || : end end diff --git a/openssh/ssh-keygen b/openssh/ssh-keygen deleted file mode 100644 index 46e64d6..0000000 --- a/openssh/ssh-keygen +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/sh - -# Generates keyfiles for defined algorithm -for algo in dsa rsa ecdsa; do - [ -e "/etc/ssh/ssh_host_${algo}_key" ] && continue - /usr/bin/ssh-keygen -q -t ${algo} -N "" -f /etc/ssh/ssh_host_${algo}_key -done - diff --git a/openssh/sshd-keygen b/openssh/sshd-keygen new file mode 100644 index 0000000..619e839 --- /dev/null +++ b/openssh/sshd-keygen @@ -0,0 +1,63 @@ +#!/bin/bash + +# Create the host keys for the OpenSSH server. +# + +# Some functions to make the below more readable +KEYGEN=/usr/bin/ssh-keygen +RSA1_KEY=/etc/ssh/ssh_host_key +RSA_KEY=/etc/ssh/ssh_host_rsa_key +DSA_KEY=/etc/ssh/ssh_host_dsa_key + +do_rsa1_keygen() { + if [ ! -s $RSA1_KEY ]; then + rm -f $RSA1_KEY + if test ! -f $RSA1_KEY && $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then + chgrp ssh_keys $RSA1_KEY + chmod 600 $RSA1_KEY + chmod 644 $RSA1_KEY.pub + if [ -x /sbin/restorecon ]; then + /sbin/restorecon $RSA1_KEY.pub + fi + else + exit 1 + fi + fi +} + +do_rsa_keygen() { + if [ ! -s $RSA_KEY ]; then + rm -f $RSA_KEY + if test ! -f $RSA_KEY && $KEYGEN -q -t rsa -f $RSA_KEY -C '' -N '' >&/dev/null; then + chgrp ssh_keys $RSA_KEY + chmod 600 $RSA_KEY + chmod 644 $RSA_KEY.pub + if [ -x /sbin/restorecon ]; then + /sbin/restorecon $RSA_KEY.pub + fi + else + exit 1 + fi + fi +} + +do_dsa_keygen() { + if [ ! -s $DSA_KEY ]; then + rm -f $DSA_KEY + if test ! -f $DSA_KEY && $KEYGEN -q -t dsa -f $DSA_KEY -C '' -N '' >&/dev/null; then + chgrp ssh_keys $DSA_KEY + chmod 600 $DSA_KEY + chmod 644 $DSA_KEY.pub + if [ -x /sbin/restorecon ]; then + /sbin/restorecon $DSA_KEY.pub + fi + else + exit 1 + fi + fi +} + +# Create keys +do_rsa_keygen +do_rsa1_keygen +do_dsa_keygen diff --git a/openssh/sshd.pam b/openssh/sshd.pam index ba632dd..a80e450 100644 --- a/openssh/sshd.pam +++ b/openssh/sshd.pam @@ -1,9 +1,15 @@ #%PAM-1.0 -auth include system-auth - +auth required pam_sepermit.so +auth substack password-auth +auth include postlogin account required pam_nologin.so -account include system-auth - -password include system-auth - -session include system-auth +account include password-auth +password include password-auth +# pam_selinux.so close should be the first session rule +session required pam_selinux.so close +session required pam_loginuid.so +# pam_selinux.so open should only be followed by sessions to be executed in the user context +session required pam_selinux.so open env_params +session optional pam_keyinit.so force revoke +session include password-auth +session include postlogin diff --git a/openssh/systemd/openssh.service b/openssh/systemd/openssh.service deleted file mode 100644 index 7fdd641..0000000 --- a/openssh/systemd/openssh.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=OpenSSH Server -After=network.target - -[Service] -ExecStartPre=/usr/lib/openssh/ssh-keygen -ExecStart=/usr/sbin/sshd -D -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/openssh/systemd/sshd-keygen.service b/openssh/systemd/sshd-keygen.service new file mode 100644 index 0000000..bfef328 --- /dev/null +++ b/openssh/systemd/sshd-keygen.service @@ -0,0 +1,12 @@ +[Unit] +Description=SSH server keys generation. +After=syslog.target +Before=sshd.service + +[Service] +Type=oneshot +ExecStart=/usr/sbin/sshd-keygen +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/openssh/systemd/sshd.service b/openssh/systemd/sshd.service new file mode 100644 index 0000000..6b90aa1 --- /dev/null +++ b/openssh/systemd/sshd.service @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSSH server daemon +After=syslog.target network.target auditd.service + +[Service] +ExecStart=/usr/sbin/sshd -D $OPTIONS +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket new file mode 100644 index 0000000..94b9533 --- /dev/null +++ b/openssh/systemd/sshd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=OpenSSH Server Socket +Conflicts=sshd.service + +[Socket] +ListenStream=22 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/openssh/systemd/sshd@.service b/openssh/systemd/sshd@.service new file mode 100644 index 0000000..09f995e --- /dev/null +++ b/openssh/systemd/sshd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=OpenSSH per-connection server daemon +After=syslog.target auditd.service + +[Service] +EnvironmentFile=/etc/sysconfig/sshd +ExecStart=-/usr/sbin/sshd -i $OPTIONS +StandardInput=socket diff --git a/samba/samba.nm b/samba/samba.nm index dcf1edf..5902b9b 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -5,7 +5,7 @@ name = samba version = 3.6.3 -release = 1 +release = 2 maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons @@ -53,17 +53,17 @@ build DIR_APP = %{DIR_SRC}/%{thisapp}/source3 configure_options += \ - --prefix=/usr \ + --prefix=%{prefix} \ --localstatedir=/var \ - --with-lockdir=/var/lib/samba \ - --with-piddir=/var/run \ - --with-mandir=/usr/share/man \ - --with-privatedir=/var/lib/samba/private \ + --with-lockdir=%{sharedstatedir}/samba \ + --with-piddir=%{rundir} \ + --with-mandir=%{mandir} \ + --with-privatedir=%{sharedstatedir}/samba/private \ --with-logfilebase=/var/log/samba \ - --with-modulesdir=/usr/lib/samba \ - --with-configdir=/etc/samba \ - --with-pammodulesdir=/lib/security \ - --with-swatdir=/usr/share/swat \ + --with-modulesdir=%{libdir}/samba \ + --with-configdir=%{sysconfdir}/samba \ + --with-pammodulesdir=/%{lib}/security \ + --with-swatdir=%{datadir}/swat \ --with-automount \ --with-libsmbclient \ --with-libsmbsharemodes \ @@ -81,8 +81,8 @@ build all modules install_cmds - mkdir -pv %{BUILDROOT}/etc/samba - echo "127.0.0.1 localhost" > %{BUILDROOT}/etc/samba/lmhosts + mkdir -pv %{BUILDROOT}%{sysconfdir}/samba + echo "127.0.0.1 localhost" > %{BUILDROOT}%{sysconfdir}/samba/lmhosts end end @@ -96,7 +96,7 @@ packages package %{name}-devel template DEVEL - requires += %{name}-libs=%{thisver} + requires += %{name}-libs = %{thisver} end package %{name}-debuginfo hooks/post-receive -- IPFire 3.x development tree

1 0

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

11 Mar '12

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 47902c21be198525dc2ebe7f4caed1c6d2497346 (commit) from 86fb1cccf0f99dbc62d1cfc831a6d0eb20237c35 (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 47902c21be198525dc2ebe7f4caed1c6d2497346 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 11 19:56:05 2012 +0100 pakfire: Add two more patches. One of them fixes wrong detection of python-abi (kernel) and the other one fixes again false detections of the libs-location check. ----------------------------------------------------------------------- Summary of changes: pakfire/pakfire.nm | 2 +- .../pakfire-0.9.20-python-abi-find-requires.patch | 29 ++++++++++++++++++++ ...akfire-0.9.20-revert-libs-location-in-usr.patch | 22 +++++++++++++++ 3 files changed, 52 insertions(+), 1 deletions(-) create mode 100644 pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch create mode 100644 pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch Difference in files: diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index cf891d3..3217f43 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -5,7 +5,7 @@ name = pakfire version = 0.9.20 -release = 5 +release = 6 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch b/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch new file mode 100644 index 0000000..512d454 --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-python-abi-find-requires.patch @@ -0,0 +1,29 @@ +commit d16c15690f94589c2667a5096c21cec16daee7b7 +Author: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun Mar 11 19:53:10 2012 +0100 + + find-requires: Filter false positives for python abi. + +diff --git a/tools/find-requires b/tools/find-requires +index 52b6651..044c59f 100755 +--- a/tools/find-requires ++++ b/tools/find-requires +@@ -43,14 +43,16 @@ while read file; do + */usr/lib*/python*/*) + # Sort out all python files. + ;; +- */usr/lib*/python*) ++ */usr/lib/python*|*/usr/lib64/python*) + # This will only get the python directory. + file=$(basename ${file}) + + # Strip the python version from the string. + python_version="${file#python}" + +- echo "python-abi = ${python_version}" ++ if [ -n "${python_version}" ]; then ++ echo "python-abi = ${python_version}" ++ fi + continue + ;; + esac diff --git a/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch b/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch new file mode 100644 index 0000000..f5b6dda --- /dev/null +++ b/pakfire/patches/pakfire-0.9.20-revert-libs-location-in-usr.patch @@ -0,0 +1,22 @@ +commit 882bb1851ab12ee3ba1561552faf90850e212052 +Author: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun Mar 11 17:59:34 2012 +0100 + + QA: libs-location: Revert checking in /usr/lib(64). + + That was not such a good idea because upstream is messing + too much with library names. + +diff --git a/tools/quality-agent.d/003-libs-location b/tools/quality-agent.d/003-libs-location +index 479f170..0ee8237 100755 +--- a/tools/quality-agent.d/003-libs-location ++++ b/tools/quality-agent.d/003-libs-location +@@ -25,7 +25,7 @@ function check() { + local failed=0 + local found + +- for lib in $(find ${BUILDROOT}/{,usr/}${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do ++ for lib in $(find ${BUILDROOT}/${libdir} -maxdepth 1 -type f -name "lib*.so.*" 2>/dev/null); do + lib=${lib##*/} + lib=${lib%%.so*} + hooks/post-receive -- IPFire 3.x development tree

1 0

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

11 Mar '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 936877563941402f5656ee8c329260d45afa4c6d
by git＠ipfire.org 11 Mar '12

11 Mar '12

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 936877563941402f5656ee8c329260d45afa4c6d (commit) from 06b197d8179d36d431232b4b9d090c366487c73e (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 936877563941402f5656ee8c329260d45afa4c6d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 11 16:53:32 2012 +0100 git: Update to 1.7.9.3. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/git | 79 ++++++++++++++++++++++++++++++++++++++--- lfs/git | 10 +++--- 2 files changed, 79 insertions(+), 10 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index f17851d..b92070e 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -6,10 +6,32 @@ usr/bin/git-upload-archive usr/bin/git-upload-pack #usr/bin/gitk usr/lib/perl5/site_perl/5.12.3/Error.pm +usr/lib/perl5/site_perl/5.12.3/Git usr/lib/perl5/site_perl/5.12.3/Git.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Git/.packlist +usr/lib/perl5/site_perl/5.12.3/Git/I18N.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Git/.packlist +usr/lib/python2.7/site-packages/git_remote_helpers +#usr/lib/python2.7/site-packages/git_remote_helpers-0.1.0-py2.7.egg-info +usr/lib/python2.7/site-packages/git_remote_helpers/__init__.py +usr/lib/python2.7/site-packages/git_remote_helpers/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/__init__.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/exporter.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/git.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/importer.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/non_local.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.py +usr/lib/python2.7/site-packages/git_remote_helpers/git/repo.pyc +usr/lib/python2.7/site-packages/git_remote_helpers/util.py +usr/lib/python2.7/site-packages/git_remote_helpers/util.pyc usr/libexec/git-core +usr/libexec/git-core/git usr/libexec/git-core/git-add usr/libexec/git-core/git-add--interactive usr/libexec/git-core/git-am @@ -36,6 +58,9 @@ usr/libexec/git-core/git-commit usr/libexec/git-core/git-commit-tree usr/libexec/git-core/git-config usr/libexec/git-core/git-count-objects +usr/libexec/git-core/git-credential-cache +usr/libexec/git-core/git-credential-cache--daemon +usr/libexec/git-core/git-credential-store usr/libexec/git-core/git-cvsexportcommit usr/libexec/git-core/git-cvsimport usr/libexec/git-core/git-cvsserver @@ -50,7 +75,6 @@ usr/libexec/git-core/git-difftool--helper usr/libexec/git-core/git-fast-export usr/libexec/git-core/git-fast-import usr/libexec/git-core/git-fetch -usr/libexec/git-core/git-fetch--tool usr/libexec/git-core/git-fetch-pack usr/libexec/git-core/git-filter-branch usr/libexec/git-core/git-fmt-merge-msg @@ -65,6 +89,7 @@ usr/libexec/git-core/git-gui usr/libexec/git-core/git-gui--askpass usr/libexec/git-core/git-hash-object usr/libexec/git-core/git-help +usr/libexec/git-core/git-http-backend usr/libexec/git-core/git-http-fetch usr/libexec/git-core/git-http-push usr/libexec/git-core/git-imap-send @@ -96,6 +121,7 @@ usr/libexec/git-core/git-mktag usr/libexec/git-core/git-mktree usr/libexec/git-core/git-mv usr/libexec/git-core/git-name-rev +usr/libexec/git-core/git-notes usr/libexec/git-core/git-pack-objects usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs @@ -109,12 +135,22 @@ usr/libexec/git-core/git-push usr/libexec/git-core/git-quiltimport usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase +usr/libexec/git-core/git-rebase--am usr/libexec/git-core/git-rebase--interactive +usr/libexec/git-core/git-rebase--merge usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-relink usr/libexec/git-core/git-remote +usr/libexec/git-core/git-remote-ext +usr/libexec/git-core/git-remote-fd +usr/libexec/git-core/git-remote-ftp +usr/libexec/git-core/git-remote-ftps +usr/libexec/git-core/git-remote-http +usr/libexec/git-core/git-remote-https +usr/libexec/git-core/git-remote-testgit usr/libexec/git-core/git-repack +usr/libexec/git-core/git-replace usr/libexec/git-core/git-repo-config usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere @@ -125,6 +161,8 @@ usr/libexec/git-core/git-revert usr/libexec/git-core/git-rm usr/libexec/git-core/git-send-email usr/libexec/git-core/git-send-pack +usr/libexec/git-core/git-sh-i18n +usr/libexec/git-core/git-sh-i18n--envsubst usr/libexec/git-core/git-sh-setup usr/libexec/git-core/git-shell usr/libexec/git-core/git-shortlog @@ -154,6 +192,22 @@ usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse usr/libexec/git-core/git-whatchanged usr/libexec/git-core/git-write-tree +usr/libexec/git-core/mergetools +usr/libexec/git-core/mergetools/araxis +usr/libexec/git-core/mergetools/bc3 +usr/libexec/git-core/mergetools/defaults +usr/libexec/git-core/mergetools/diffuse +usr/libexec/git-core/mergetools/ecmerge +usr/libexec/git-core/mergetools/emerge +usr/libexec/git-core/mergetools/kdiff3 +usr/libexec/git-core/mergetools/kompare +usr/libexec/git-core/mergetools/meld +usr/libexec/git-core/mergetools/opendiff +usr/libexec/git-core/mergetools/p4merge +usr/libexec/git-core/mergetools/tkdiff +usr/libexec/git-core/mergetools/tortoisemerge +usr/libexec/git-core/mergetools/vim +usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates usr/share/git-core/templates/branches @@ -161,8 +215,6 @@ usr/share/git-core/templates/description usr/share/git-core/templates/hooks usr/share/git-core/templates/hooks/applypatch-msg.sample usr/share/git-core/templates/hooks/commit-msg.sample -usr/share/git-core/templates/hooks/post-commit.sample -usr/share/git-core/templates/hooks/post-receive.sample usr/share/git-core/templates/hooks/post-update.sample usr/share/git-core/templates/hooks/pre-applypatch.sample usr/share/git-core/templates/hooks/pre-commit.sample @@ -195,16 +247,19 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/error.tcl #usr/share/git-gui/lib/git-gui.ico #usr/share/git-gui/lib/index.tcl +#usr/share/git-gui/lib/line.tcl #usr/share/git-gui/lib/logo.tcl #usr/share/git-gui/lib/merge.tcl #usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs #usr/share/git-gui/lib/msgs/de.msg +#usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg #usr/share/git-gui/lib/msgs/hu.msg #usr/share/git-gui/lib/msgs/it.msg #usr/share/git-gui/lib/msgs/ja.msg #usr/share/git-gui/lib/msgs/nb.msg +#usr/share/git-gui/lib/msgs/pt_br.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg #usr/share/git-gui/lib/msgs/zh_cn.msg @@ -218,6 +273,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/sshkey.tcl #usr/share/git-gui/lib/status_bar.tcl #usr/share/git-gui/lib/tclIndex +#usr/share/git-gui/lib/themed.tcl #usr/share/git-gui/lib/tools.tcl #usr/share/git-gui/lib/tools_dlg.tcl #usr/share/git-gui/lib/transport.tcl @@ -228,8 +284,21 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg +#usr/share/gitk/lib/msgs/fr.msg +#usr/share/gitk/lib/msgs/hu.msg #usr/share/gitk/lib/msgs/it.msg +#usr/share/gitk/lib/msgs/ja.msg +#usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitweb +#usr/share/gitweb/gitweb.cgi +#usr/share/gitweb/static +#usr/share/gitweb/static/git-favicon.png +#usr/share/gitweb/static/git-logo.png +#usr/share/gitweb/static/gitweb.css +#usr/share/gitweb/static/gitweb.js +#usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/man/man3/Git.3 +#usr/share/man/man3/Git::I18N.3 #usr/share/man/man3/private-Error.3 diff --git a/lfs/git b/lfs/git index 253b819..82b90fd 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@ include Config -VER = 1.6.3.1 +VER = 1.7.9.3 THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 7 +PAK_VER = 8 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c1f4aab741359c29f0fbf28563ac7387 +$(DL_FILE)_MD5 = f93b976649216d731fd9f9befb90a58c install : $(TARGET) @@ -76,7 +76,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) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install hooks/post-receive -- IPFire 2.x development tree

1 0

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

11 Mar '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06b197d8179d36d431232b4b9d090c366487c73e
by git＠ipfire.org 11 Mar '12

11 Mar '12

1 0

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

11 Mar '12

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 f0cf8bd3bb59ae2b44a3f049d24b7a2cd97edf6d (commit) from 958fb3937cffbb585bb325f68c7bde9d8a24ca21 (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 f0cf8bd3bb59ae2b44a3f049d24b7a2cd97edf6d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Mar 11 11:51:06 2012 +0100 ebtables: Make package work on x86_64. ----------------------------------------------------------------------- Summary of changes: ebtables/ebtables.nm | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) Difference in files: diff --git a/ebtables/ebtables.nm b/ebtables/ebtables.nm index f5ca3a0..846ed96 100644 --- a/ebtables/ebtables.nm +++ b/ebtables/ebtables.nm @@ -5,7 +5,7 @@ name = ebtables version = v2.0.10-4 -release = 1 +release = 2 groups = Networking/Tools url = http://ebtables.sourceforge.net/ @@ -24,22 +24,22 @@ build CFLAGS += -Wall build - make CFLAGS="%{CFLAGS}" BINDIR="/sbin" \ - LIBDIR="/lib/ebtables" MANDIR="/usr/share/man" %{PARALLELISMFLAGS} + make CFLAGS="%{CFLAGS}" BINDIR="%{sbindir}" \ + LIBDIR="%{libdir}/ebtables" MANDIR="%{mandir}" %{PARALLELISMFLAGS} end install - mkdir -pv %{BUILDROOT}/etc/{init.d,sysconfig} - make install DESTDIR="%{BUILDROOT}" BINDIR="/sbin" \ - LIBDIR="/lib/ebtables" MANDIR="/usr/share/man" INITDIR="/etc/init.d" + make install DESTDIR="%{BUILDROOT}" BINDIR="%{sbindir}" \ + LIBDIR="%{libdir}/ebtables" MANDIR="%{mandir}" - rm -vfr %{BUILDROOT}/etc/{init.d,sysconfig} + # Remove unneded directories. + rm -rvf %{BUILDROOT}/etc/{rc.d,sysconfig} end end quality-agent whitelist_rpath - /lib/ebtables + %{libdir}/ebtables end end 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 March 2012