IPFire-SCM May 2012

ipfire-scm@lists.ipfire.org

1 participants
66 discussions

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

02 May '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 255c4793b52add6577e6cf856636adfa20a8b308
by git＠ipfire.org 02 May '12

02 May '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 255c4793b52add6577e6cf856636adfa20a8b308 (commit) via 669b7cfcf7b61dadd1b31f9b7f2033611f86d8da (commit) via a5248e727fa4833fed0c910aff92658288bef388 (commit) via 631a299723fd2e60a79d4bfcd2ebbdda7846aa2a (commit) from b60a4efcd4cfeb298e4c6e393a950e5b27712d19 (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 255c4793b52add6577e6cf856636adfa20a8b308 Merge: 669b7cf a5248e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 17:24:09 2012 +0200 Merge remote-tracking branch 'ms/git' commit 669b7cfcf7b61dadd1b31f9b7f2033611f86d8da Merge: b60a4ef 631a299 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 17:23:56 2012 +0200 Merge remote-tracking branch 'ms/ncurses-terminfo' commit a5248e727fa4833fed0c910aff92658288bef388 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 13:51:39 2012 +0000 git: Install bash-completion file. bash-completion is a very handy feature and we want to make use of it. commit 631a299723fd2e60a79d4bfcd2ebbdda7846aa2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 13:49:15 2012 +0000 ncurses: Package essential terminfo files in -base package. The most essential terminfo files have been moved to /lib/terminfo which does not exist anymore. But as those files need to be installed on every system, they are now packaged in the -base package. ----------------------------------------------------------------------- Summary of changes: git/git.nm | 12 +++++++++++- ncurses/ncurses.nm | 10 +++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) Difference in files: diff --git a/git/git.nm b/git/git.nm index df2f449..361fad9 100644 --- a/git/git.nm +++ b/git/git.nm @@ -5,7 +5,7 @@ name = git version = 1.7.8.2 -release = 1 +release = 2 groups = Development/Tools url = http://git-scm.com/ @@ -45,6 +45,9 @@ build echo "prefix = /usr" >> %{DIR_APP}/config.mak echo "gitwebdir = /var/www/git" >> %{DIR_APP}/config.mak echo "gitexecdir = lib/git-core" >> %{DIR_APP}/config.mak + + # Remove shebang from bash-completion script. + sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash end build @@ -52,6 +55,13 @@ build end make_install_targets += INSTALLDIRS=vendor + + install_cmds + # Install bash completion file. + mkdir -pv %{BUILDROOT}%{sysconfdir}/bash_completion.d + install -v -m 644 contrib/completion/git-completion.bash \ + %{BUILDROOT}%{sysconfdir}/bash_completion.d/git + end end packages diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 35c1cc0..7b3f918 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@ name = ncurses version = 5.9 -release = 8 +release = 9 groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -126,10 +126,12 @@ packages files /usr/share/terminfo/*/Eterm* + /usr/share/terminfo/*/ansi /usr/share/terminfo/*/aterm /usr/share/terminfo/*/bterm /usr/share/terminfo/*/cons25 /usr/share/terminfo/*/cygwin + /usr/share/terminfo/*/dumb /usr/share/terminfo/*/eterm* /usr/share/terminfo/*/gnome /usr/share/terminfo/*/gnome-256color @@ -137,6 +139,7 @@ packages /usr/share/terminfo/*/jfbterm /usr/share/terminfo/*/konsole /usr/share/terminfo/*/konsole-256color + /usr/share/terminfo/*/linux /usr/share/terminfo/*/mach* /usr/share/terminfo/*/mlterm /usr/share/terminfo/*/mrxvt @@ -151,6 +154,11 @@ packages /usr/share/terminfo/*/sun /usr/share/terminfo/*/teraterm /usr/share/terminfo/*/teraterm2.3 + /usr/share/terminfo/*/vt100 + /usr/share/terminfo/*/vt100-nav + /usr/share/terminfo/*/vt102 + /usr/share/terminfo/*/vt220 + /usr/share/terminfo/*/vt52 /usr/share/terminfo/*/vte /usr/share/terminfo/*/vte-256color /usr/share/terminfo/*/vwmterm hooks/post-receive -- IPFire 3.x development tree

1 0

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

02 May '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 b60a4efcd4cfeb298e4c6e393a950e5b27712d19 (commit) via 4d4a3454173ea39e93f89e37f0f6d96466a2058b (commit) via 61a17f839e42260435d494989d49d716a2bb58c5 (commit) via 91e84366671821a8210fa04392906d43c9f356d2 (commit) via 1432fd3522b178ddb6d3b389fd625d04c059d61b (commit) via 745379c6362a63e9e55ce734930fef85be9c151b (commit) via 69db94b26b7afc5df08a62bdea04d2c4132ce560 (commit) via c0a8c22d5c2f0a22f512d24fc3203ed716cf6ff6 (commit) from ad279e1234f4a1022027a343edc9aa0480e7d5fe (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 b60a4efcd4cfeb298e4c6e393a950e5b27712d19 Merge: 4d4a345 1432fd3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 15:30:50 2012 +0200 Merge remote-tracking branch 'maniacikarus/samba' commit 4d4a3454173ea39e93f89e37f0f6d96466a2058b Merge: 61a17f8 91e8436 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 15:30:45 2012 +0200 Merge remote-tracking branch 'stevee/dmraid' commit 61a17f839e42260435d494989d49d716a2bb58c5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 2 15:29:07 2012 +0200 lvm2: Fix packaging the .pc files on x86_64. commit 91e84366671821a8210fa04392906d43c9f356d2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue May 1 21:05:48 2012 +0200 dmraid: Also install shared library. We now install a correct versioned shared library. commit 1432fd3522b178ddb6d3b389fd625d04c059d61b Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue May 1 15:07:22 2012 +0200 samba: Remove the pidfiles from systemd file since they are not needed and services are not correctly started by systemd under some cirustances commit 745379c6362a63e9e55ce734930fef85be9c151b Merge: 69db94b 371d4b9 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Tue May 1 15:02:18 2012 +0200 Merge branch 'master' into samba commit 69db94b26b7afc5df08a62bdea04d2c4132ce560 Merge: c0a8c22 5dfd48b Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Apr 30 19:14:38 2012 +0200 Merge branch 'master' into samba commit c0a8c22d5c2f0a22f512d24fc3203ed716cf6ff6 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Apr 30 14:58:13 2012 +0200 samba: Updated to version 3.6.5. This release fixes CVE-2012-2111. ----------------------------------------------------------------------- Summary of changes: dmraid/dmraid.nm | 8 ++++++++ lvm2/lvm2.nm | 3 ++- samba/samba.nm | 2 +- samba/systemd/nmb.service | 1 - samba/systemd/smb.service | 1 - samba/systemd/winbind.service | 1 - 6 files changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/dmraid/dmraid.nm b/dmraid/dmraid.nm index f0fbf17..67df612 100644 --- a/dmraid/dmraid.nm +++ b/dmraid/dmraid.nm @@ -37,6 +37,8 @@ build --disable-static_link \ --enable-libselinux + # Dmraid doesn't automatically build and install a versioned library + # so we do it on or own. build_cmds make -C lib libdmraid.so end @@ -45,6 +47,12 @@ build # Install development headers. mkdir -pv %{BUILDROOT}%{includedir}/dmraid install -m 644 include/dmraid/*.h %{BUILDROOT}%{includedir}/dmraid/ + + # Manually install versioned library and create symlinks. + mkdir -pv %{BUILDROOT}%{libdir} + install -m 755 lib/libdmraid.so %{BUILDROOT}%{libdir}/libdmraid.so.%{version} + ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so.1 + ln -sv libdmraid.so.%{version} %{BUILDROOT}%{libdir}/libdmraid.so end end diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm index 49b4828..babc5d7 100644 --- a/lvm2/lvm2.nm +++ b/lvm2/lvm2.nm @@ -5,7 +5,7 @@ name = lvm2 version = 2.02.95 -release = 1 +release = 2 thisapp = LVM2.%{version} groups = System/Base @@ -34,6 +34,7 @@ build end configure_options += \ + --with-usrlibdir=%{libdir} \ --enable-pkgconfig end diff --git a/samba/samba.nm b/samba/samba.nm index 3ca947a..75274f2 100644 --- a/samba/samba.nm +++ b/samba/samba.nm @@ -5,7 +5,7 @@ name = samba version = 3.6.5 -release = 1 +release = 2 maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org> groups = Networking/Daemons diff --git a/samba/systemd/nmb.service b/samba/systemd/nmb.service index 0dca74c..b0b447e 100644 --- a/samba/systemd/nmb.service +++ b/samba/systemd/nmb.service @@ -4,7 +4,6 @@ After=syslog.target network.target [Service] Type=forking -PIDFile=/run/nmbd.pid ExecStart=/usr/sbin/nmbd [Install] diff --git a/samba/systemd/smb.service b/samba/systemd/smb.service index 4f09a4d..b62df5c 100644 --- a/samba/systemd/smb.service +++ b/samba/systemd/smb.service @@ -4,7 +4,6 @@ After=syslog.target network.target nmb.service winbind.service [Service] Type=forking -PIDFile=/run/smbd.pid LimitNOFILE=16384 ExecStart=/usr/sbin/smbd diff --git a/samba/systemd/winbind.service b/samba/systemd/winbind.service index 39cbf53..5ae1c2f 100644 --- a/samba/systemd/winbind.service +++ b/samba/systemd/winbind.service @@ -4,7 +4,6 @@ After=syslog.target network.target nmb.service [Service] Type=forking -PIDFile=/run/winbindd.pid ExecStart=/usr/sbin/winbindd [Install] hooks/post-receive -- IPFire 3.x development tree

1 0

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

02 May '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 ad279e1234f4a1022027a343edc9aa0480e7d5fe (commit) via 83460ad12427057f220a0203990ded1a4bce6710 (commit) via eccf0dae38f0a6dce1ac7320e5b6a2dedcc9323b (commit) from 4121e158baacff470c2ee8dd5bec852f22e9b1a0 (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 ad279e1234f4a1022027a343edc9aa0480e7d5fe Merge: eccf0da 83460ad Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 1 15:12:46 2012 +0200 Merge remote-tracking branch 'ms/ncurses-terminfo' commit 83460ad12427057f220a0203990ded1a4bce6710 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 1 13:10:16 2012 +0000 ncurses: Move terminfo files out of /lib. This is part of the UsrMove process. xterm terminfo files were not in the base package which has been fixed as well. commit eccf0dae38f0a6dce1ac7320e5b6a2dedcc9323b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 1 14:36:23 2012 +0200 openssh: Fix systemd service files. OpenSSH had problems with starting the daemon after installation. This is now fixed. ----------------------------------------------------------------------- Summary of changes: ncurses/ncurses.nm | 35 +++++------------------------------ openssh/openssh.nm | 6 ++---- openssh/systemd/sshd-keygen.service | 4 +--- openssh/systemd/sshd.service | 3 ++- openssh/systemd/sshd.socket | 10 ---------- openssh/systemd/sshd@.service | 8 -------- 6 files changed, 10 insertions(+), 56 deletions(-) delete mode 100644 openssh/systemd/sshd.socket delete mode 100644 openssh/systemd/sshd@.service Difference in files: diff --git a/ncurses/ncurses.nm b/ncurses/ncurses.nm index 683c6a8..35c1cc0 100644 --- a/ncurses/ncurses.nm +++ b/ncurses/ncurses.nm @@ -5,7 +5,7 @@ name = ncurses version = 5.9 -release = 7 +release = 8 groups = System/Base url = http://invisible-island.net/ncurses/ncurses.html @@ -35,7 +35,7 @@ build --enable-hard-tabs \ --enable-xmc-glitch \ --enable-colorfgbg \ - --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo:/lib/terminfo \ + --with-terminfo-dirs=%{sysconfdir}/terminfo:%{datadir}/terminfo \ --enable-overwrite \ --enable-pc-files \ --with-termlib=tinfo @@ -67,32 +67,7 @@ build chmod -v 755 %{BUILDROOT}%{libdir}/lib*.so.*.* - mkdir -pv %{BUILDROOT}/{etc,lib}/terminfo - - # move few basic terminfo entries to /lib - baseterms= - for termname in \ - ansi dumb linux vt100 vt100-nav vt102 vt220 vt52; do - for t in $(find %{BUILDROOT}/usr/share/terminfo \ - -samefile %{BUILDROOT}/usr/share/terminfo/${termname::1}/$termname); do - baseterms="$baseterms $(basename $t)" - done - done - for termname in ${baseterms}; do - termpath=terminfo/${termname::1}/${termname} - mkdir -pv %{BUILDROOT}/lib/terminfo/${termname::1} - mv -v %{BUILDROOT}/usr/share/${termpath} %{BUILDROOT}/lib/${termpath} - ln -svf $(dirname /usr/share/${termpath} | \ - sed 's,$^/\|$[^/][^/]*,..,g')/lib/${termpath} \ - %{BUILDROOT}/usr/share//${termpath} - done - - # can't replace directory with symlink, symlink all headers - #mkdir %{BUILDROOT}/usr/include/ncurses{,w} - #for l in %{BUILDROOT}/usr/include/*.h; do - # ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncurses - # ln -s ../$(basename $l) %{BUILDROOT}/usr/include/ncursesw - #done + mkdir -pv %{BUILDROOT}/etc/terminfo # don't require -ltinfo when linking with --no-add-needed for l in %{BUILDROOT}%{libdir}/libncurses{,w}.so; do @@ -150,7 +125,6 @@ packages conflicts = ncurses<=5.9-1 files - /lib/terminfo /usr/share/terminfo/*/Eterm* /usr/share/terminfo/*/aterm /usr/share/terminfo/*/bterm @@ -182,7 +156,8 @@ packages /usr/share/terminfo/*/vwmterm /usr/share/terminfo/*/wsvt25* /usr/share/terminfo/*/xfce - /usr/share/terminfo/*/xterm xterm-* + /usr/share/terminfo/*/xterm + /usr/share/terminfo/*/xterm-* end end diff --git a/openssh/openssh.nm b/openssh/openssh.nm index d04d2b2..b2b90e4 100644 --- a/openssh/openssh.nm +++ b/openssh/openssh.nm @@ -5,7 +5,7 @@ name = openssh version = 5.9p1 -release = 4 +release = 5 groups = Application/Internet url = http://www.openssh.com/portable.html @@ -122,7 +122,7 @@ packages end script prein - getent group sshd_keys >/dev/null || groupadd -r ssh_keys || : + getent group ssh_keys >/dev/null || groupadd -r ssh_keys end end @@ -203,9 +203,7 @@ packages script preun /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 diff --git a/openssh/systemd/sshd-keygen.service b/openssh/systemd/sshd-keygen.service index bfef328..1554c24 100644 --- a/openssh/systemd/sshd-keygen.service +++ b/openssh/systemd/sshd-keygen.service @@ -2,11 +2,9 @@ Description=SSH server keys generation. After=syslog.target Before=sshd.service +BindTo=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 index 6b90aa1..9007d89 100644 --- a/openssh/systemd/sshd.service +++ b/openssh/systemd/sshd.service @@ -3,7 +3,8 @@ Description=OpenSSH server daemon After=syslog.target network.target auditd.service [Service] -ExecStart=/usr/sbin/sshd -D $OPTIONS +ExecStartPre=/usr/sbin/sshd-keygen +ExecStart=/usr/sbin/sshd -D ExecReload=/bin/kill -HUP $MAINPID [Install] diff --git a/openssh/systemd/sshd.socket b/openssh/systemd/sshd.socket deleted file mode 100644 index 94b9533..0000000 --- a/openssh/systemd/sshd.socket +++ /dev/null @@ -1,10 +0,0 @@ -[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 deleted file mode 100644 index 09f995e..0000000 --- a/openssh/systemd/sshd@.service +++ /dev/null @@ -1,8 +0,0 @@ -[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 hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c
by git＠ipfire.org 02 May '12

02 May '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, master has been updated via 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c (commit) from de887913ee5c688b8500ec7f6dbe376ce436d492 (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 9f82cdb1f8a804b52ab28f6dfb42b08b90e1197c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed May 2 10:10:07 2012 +0200 samba: security update to 3.5.15. (CVE-2012-2111). This security release addresses CVE-2012-2111 (incorrect permission checks when granting/removing privileges could compromise file server security). ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/samba.cgi | 4 ++-- lfs/samba | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 57970db..27856ca 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPFire Team # +# Copyright (C) 2005-2012 IPFire Team <info(a)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 # @@ -77,7 +77,7 @@ my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd'); $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.9'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '33'; diff --git a/lfs/samba b/lfs/samba index 9708a9a..e27ee08 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)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 # @@ -24,7 +24,7 @@ include Config -VER = 3.5.14 +VER = 3.5.15 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 = 39 +PAK_VER = 40 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a97f5647face6e9214d5c42903412474 +$(DL_FILE)_MD5 = 2d72c044bdfd854ee2ab736326da3afd install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4121e158baacff470c2ee8dd5bec852f22e9b1a0
by git＠ipfire.org 01 May '12

01 May '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 4121e158baacff470c2ee8dd5bec852f22e9b1a0 (commit) via df0b7811952d558c92aea55b141b1e3b3d5d6567 (commit) from 371d4b90b09c56ee5e07f3f72c19a26ae9fc6237 (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 4121e158baacff470c2ee8dd5bec852f22e9b1a0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 30 23:20:18 2012 +0200 acpid: Update to 2.0.16 (among other changes). The package is from now on only built for x86 architectures and will be enabled by default when installed. commit df0b7811952d558c92aea55b141b1e3b3d5d6567 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 30 22:50:53 2012 +0200 make: The man page has been installed in a wrong directory. ----------------------------------------------------------------------- Summary of changes: acpid/acpid.nm | 37 +++++++++++++++++++++-------- acpid/acpid.sysconfig | 1 - acpid/patches/acpid-2.0.15-makefile.patch | 24 ++++++++++++++++++ acpid/patches/acpid-2.0.2-makefile.patch | 30 ----------------------- acpid/systemd/acpid.service | 10 +------- make/make.nm | 5 +--- 6 files changed, 53 insertions(+), 54 deletions(-) delete mode 100644 acpid/acpid.sysconfig create mode 100644 acpid/patches/acpid-2.0.15-makefile.patch delete mode 100644 acpid/patches/acpid-2.0.2-makefile.patch Difference in files: diff --git a/acpid/acpid.nm b/acpid/acpid.nm index b0baa16..0973b03 100644 --- a/acpid/acpid.nm +++ b/acpid/acpid.nm @@ -4,8 +4,11 @@ ############################################################################### name = acpid -version = 2.0.9 -release = 5 +version = 2.0.16 +release = 1 + +# ACPI is only available on x86 architectures. +sup_arches = x86_64 i686 groups = System/Daemons url = http://tedfelix.com/linux/acpid-netlink.html @@ -17,26 +20,40 @@ description end source_dl = http://tedfelix.com/linux/ +sources = %{thisapp}.tar.xz build - build - sed -e "s/-Werror//g" -i Makefile - make CC=gcc RPM_OPT_FLAGS="%{CFLAGS}" %{PARALLLEISMFLAGS} - end - install_cmds mkdir -pv %{BUILDROOT}/etc/acpi/{actions,events} cp -vf %{DIR_SOURCE}/power %{BUILDROOT}/etc/acpi/events/ cp -vf %{DIR_SOURCE}/power.sh %{BUILDROOT}/etc/acpi/actions/ - - mkdir -pv %{BUILDROOT}/etc/sysconfig - cp -vf %{DIR_SOURCE}/acpid.sysconfig %{BUILDROOT}/etc/sysconfig/acpid end end packages package %{name} groups += Base + + script postin + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + + # ACPI is enabled by default. + /usr/bin/systemctl --no-reload enable acpid.service >/dev/null 2>&1 || : + end + + script preun + /usr/bin/systemctl --no-reload disable acpid.service >/dev/null 2>&1 || : + /usr/bin/systemctl stop acpid.service >/dev/null 2>&1 || : + end + + script postun + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + /usr/bin/systemctl try-restart acpid.service >/dev/null 2>&1 || : + end end package %{name}-debuginfo diff --git a/acpid/acpid.sysconfig b/acpid/acpid.sysconfig deleted file mode 100644 index f0d2bfb..0000000 --- a/acpid/acpid.sysconfig +++ /dev/null @@ -1 +0,0 @@ -OPTIONS= diff --git a/acpid/patches/acpid-2.0.15-makefile.patch b/acpid/patches/acpid-2.0.15-makefile.patch new file mode 100644 index 0000000..0168986 --- /dev/null +++ b/acpid/patches/acpid-2.0.15-makefile.patch @@ -0,0 +1,24 @@ +diff -up acpid-2.0.15/Makefile.am.mk acpid-2.0.15/Makefile.am +--- acpid-2.0.15/Makefile.am.mk 2012-02-17 04:37:12.109907134 +0100 ++++ acpid-2.0.15/Makefile.am 2012-03-16 11:27:15.127573044 +0100 +@@ -20,7 +20,7 @@ acpi_listen_SOURCES = acpi_listen.c log. + + dist_man8_MANS = acpid.8 acpi_listen.8 + +-dist_doc_DATA = COPYING Changelog README TESTPLAN TODO ++dist_doc_DATA = + + # Just docs to add to the dist. + # One problem with this is that it includes all files in the samples dir +diff -up acpid-2.0.15/Makefile.in.mk acpid-2.0.15/Makefile.in +--- acpid-2.0.15/Makefile.in.mk 2012-03-16 11:28:53.568421905 +0100 ++++ acpid-2.0.15/Makefile.in 2012-03-16 11:29:21.679378750 +0100 +@@ -276,7 +276,7 @@ acpid_SOURCES = acpid.c acpi_ids.c conne + + acpi_listen_SOURCES = acpi_listen.c log.c ud_socket.c + dist_man8_MANS = acpid.8 acpi_listen.8 +-dist_doc_DATA = COPYING Changelog README TESTPLAN TODO ++dist_doc_DATA = + + # Just docs to add to the dist. + # One problem with this is that it includes all files in the samples dir diff --git a/acpid/patches/acpid-2.0.2-makefile.patch b/acpid/patches/acpid-2.0.2-makefile.patch deleted file mode 100644 index 0ba9e79..0000000 --- a/acpid/patches/acpid-2.0.2-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile -diff -up acpid-2.0.2/Makefile.makefile acpid-2.0.2/Makefile ---- acpid-2.0.2/Makefile.makefile 2010-01-27 00:36:23.000000000 +0100 -+++ acpid-2.0.2/Makefile 2010-02-25 16:01:39.641024017 +0100 -@@ -31,8 +31,9 @@ MAN8GZ = $(MAN8:.8=.8.gz) - - DOCS = COPYING Changelog README TESTPLAN TODO - --CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE $(OPT) \ -- -fno-strict-aliasing -g $(DEFS) -+CFLAGS = -W -Wall -Werror -Wundef -Wshadow -D_GNU_SOURCE -O2 $(OPT) \ -+ -fno-strict-aliasing -g $(DEFS) $(RPM_OPT_FLAGS) -fPIE -+LDFLAGS = -pie -Wl,-z,relro - DEFS = -DVERSION="\"$(VERSION)\"" - - all: $(PROGS) -@@ -46,8 +47,8 @@ man: $(MAN8) - - install_docs: - mkdir -p $(DESTDIR)/$(DOCDIR) -- for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done -- cp -a samples $(DESTDIR)/$(DOCDIR) -+ #for a in $(DOCS); do install -m 0644 $$a $(DESTDIR)/$(DOCDIR) ; done -+ #cp -a samples $(DESTDIR)/$(DOCDIR) - - install: $(PROGS) man install_docs - mkdir -p $(DESTDIR)/$(SBINDIR) diff --git a/acpid/systemd/acpid.service b/acpid/systemd/acpid.service index 553b3e2..0826d86 100644 --- a/acpid/systemd/acpid.service +++ b/acpid/systemd/acpid.service @@ -2,17 +2,9 @@ Description=ACPI Event Daemon After=syslog.target -# This could probably benefit from socket activation, but honestly I think it -# is time for acpid to go away, and hence I am not planning to spend the time -# to add socket activation here. We use Type=forking to ensure that the -# communication sockets are in place before boot proceeds with any service -# needing this service. Would acpid support socket activation we could use -# Type=simple here. - [Service] Type=forking -EnvironmentFile=/etc/sysconfig/acpid -ExecStart=/usr/sbin/acpid $OPTIONS +ExecStart=/usr/sbin/acpid [Install] WantedBy=multi-user.target diff --git a/make/make.nm b/make/make.nm index 2a8fb0a..792fbef 100644 --- a/make/make.nm +++ b/make/make.nm @@ -5,7 +5,7 @@ name = make version = 3.81 -release = 2 +release = 3 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Tools @@ -26,9 +26,6 @@ source_dl = sources = %{thisapp}.tar.bz2 build - configure_options += \ - --mandir=/usr/share - test sed -e "s/-w/& /" -i tests/scripts/features/recursion make check 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 May 2012