IPFire-SCM August 2011

ipfire-scm@lists.ipfire.org

1 participants
59 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 73fb1722f01b62aa0c9f7a98448d661f790d8803
by git＠ipfire.org 08 Aug '11

08 Aug '11

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 73fb1722f01b62aa0c9f7a98448d661f790d8803 (commit) via d4c8762e01ad855f5774c76a26e905bcb06538ab (commit) via e59bc03bb02ed97ab06b7378277fd0c64076e7c7 (commit) from fecf34a85a34c514dd044fa6b28946ae4a294fbc (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 73fb1722f01b62aa0c9f7a98448d661f790d8803 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 8 22:46:42 2011 +0200 mpd: update to 0.16.3. commit d4c8762e01ad855f5774c76a26e905bcb06538ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 8 22:46:13 2011 +0200 mpc: update to 0.21. commit e59bc03bb02ed97ab06b7378277fd0c64076e7c7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 8 22:45:25 2011 +0200 libmpdclient: update to 2.5. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/libmpdclient | 3 ++- lfs/libmpdclient | 6 +++--- lfs/mpc | 6 +++--- lfs/mpd | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/libmpdclient b/config/rootfiles/packages/libmpdclient index df102d7..a349cfd 100644 --- a/config/rootfiles/packages/libmpdclient +++ b/config/rootfiles/packages/libmpdclient @@ -11,6 +11,7 @@ #usr/include/mpd/error.h #usr/include/mpd/idle.h #usr/include/mpd/list.h +#usr/include/mpd/message.h #usr/include/mpd/mixer.h #usr/include/mpd/output.h #usr/include/mpd/pair.h @@ -35,7 +36,7 @@ #usr/lib/libmpdclient.la usr/lib/libmpdclient.so usr/lib/libmpdclient.so.2 -usr/lib/libmpdclient.so.2.0.1 +usr/lib/libmpdclient.so.2.0.5 #usr/lib/pkgconfig/libmpdclient.pc #usr/share/doc/libmpdclient #usr/share/doc/libmpdclient/COPYING diff --git a/lfs/libmpdclient b/lfs/libmpdclient index e2e8bde..afbbb7d 100644 --- a/lfs/libmpdclient +++ b/lfs/libmpdclient @@ -24,7 +24,7 @@ include Config -VER = 2.4 +VER = 2.5 THISAPP = libmpdclient-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libmpdclient -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8c166c5212dd95d538d3a35bb9ad4634 +$(DL_FILE)_MD5 = c1e359de6fbee3dc052deaeed05350db install : $(TARGET) diff --git a/lfs/mpc b/lfs/mpc index f3e4848..01872bf 100644 --- a/lfs/mpc +++ b/lfs/mpc @@ -24,7 +24,7 @@ include Config -VER = 0.20 +VER = 0.21 THISAPP = mpc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpc -PAK_VER = 5 +PAK_VER = 6 DEPS = "mpd libmpdclient" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 24c81ad6afe6099e8d7a6826ef4b7105 +$(DL_FILE)_MD5 = d8f88aad5fa7ed4c6e7005c5ec1ba7c5 install : $(TARGET) diff --git a/lfs/mpd b/lfs/mpd index 7cd616e..f673c85 100644 --- a/lfs/mpd +++ b/lfs/mpd @@ -24,15 +24,15 @@ include Config -VER = 0.16.2 +VER = 0.16.3 THISAPP = mpd-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/${THISAPP} TARGET = $(DIR_INFO)/$(THISAPP) PROG = mpd -PAK_VER = 12 +PAK_VER = 13 DEPS = "alsa faad2 ffmpeg-libs glib lame libshout libogg libid3tag libvorbis" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = a75ad715cc381dc5efeff6dbf313a954 +$(DL_FILE)_MD5 = 6e708c02b0e8c288aec855eecf441a5a install : $(TARGET) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr \ --disable-ipv6 \ --sysconfdir=/etc \ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. fecf34a85a34c514dd044fa6b28946ae4a294fbc
by git＠ipfire.org 08 Aug '11

08 Aug '11

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 fecf34a85a34c514dd044fa6b28946ae4a294fbc (commit) from bddc81b43c4ee68ed2eb32f23b0b337b0e1f76ab (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 fecf34a85a34c514dd044fa6b28946ae4a294fbc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Aug 8 07:43:55 2011 +0200 nagios_nrpe: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/nagios_nrpe | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe index 943d8f5..e499d6a 100644 --- a/config/rootfiles/packages/nagios_nrpe +++ b/config/rootfiles/packages/nagios_nrpe @@ -1 +1,3 @@ +#root/.rnd +usr/bin/nrpe usr/lib/nagios/check_nrpe hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b5d35c1c8cba2d86d6923e8aeefbb213ca4d6349
by git＠ipfire.org 07 Aug '11

07 Aug '11

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 b5d35c1c8cba2d86d6923e8aeefbb213ca4d6349 (commit) from 0f7866b5e9298bf0a8d39425065985b0f42bda9b (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 b5d35c1c8cba2d86d6923e8aeefbb213ca4d6349 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 23:17:04 2011 +0200 pdns-recursor: Apply default configuration and update systemd files. Squashed commit of the following: commit 281610665b623f932c9f23a064885d82b4778d3b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 23:13:19 2011 +0200 pdns-recursor: Fix typo. commit dab23e897531056d9d4d33d166dc00ddb371247a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 22:53:20 2011 +0200 pdns-recursor: Remove shipped config file. commit 800b254840611026c690d8502afa51a0e682819c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 22:42:50 2011 +0200 pdns-recursor: Improve systemd service file. commit d71560c7083d02bdbc9d0ac94235936e20f5fa07 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 22:33:22 2011 +0200 pdns-recursor: Add tmpfile for systemd. commit f5e7003455eb455780c6638a661201c35efb3ea7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 22:30:15 2011 +0200 pdns-recursor: Add default config. commit 882aa37ccdc0bca6d0a1ef39b9629e8c54acbbff Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 21:57:53 2011 +0200 pdns-recursor: Always restart service. ----------------------------------------------------------------------- Summary of changes: pkgs/pdns-recursor/pdns-recursor.nm | 15 +++++++++++++-- pkgs/pdns-recursor/pdns-recursor.tmpfiles | 1 + pkgs/pdns-recursor/recursor.conf | 13 +++++++++++++ pkgs/pdns-recursor/systemd/pdns-recursor.service | 3 +++ 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/pdns-recursor/pdns-recursor.tmpfiles create mode 100644 pkgs/pdns-recursor/recursor.conf Difference in files: diff --git a/pkgs/pdns-recursor/pdns-recursor.nm b/pkgs/pdns-recursor/pdns-recursor.nm index 9e4a995..05a85cc 100644 --- a/pkgs/pdns-recursor/pdns-recursor.nm +++ b/pkgs/pdns-recursor/pdns-recursor.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = pdns-recursor PKG_VER = 3.3 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUPS = Networking/DNS @@ -56,7 +56,18 @@ define STAGE_INSTALL cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ CONFIGDIR=/etc/$(PKG_NAME) + # Remove sysvinit file rm -rf $(BUILDROOT)/etc/init.d - mv -v $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf{-dist,} + # Remove shipped config file + rm -rf $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf-dist + + # Install our default config file + cp -vf $(DIR_SOURCE)/recursor.conf $(BUILDROOT)/etc/$(PKG_NAME)/recursor.conf + + # Create folder for chroot + -mkdir -pv $(BUILDROOT)/var/lib/pdns-recursor endef + +# XXX Need to create user and group "pdns-recursor" at installation +# useradd -r -g pdns-recursor pdns-recursor -d /var/lib/pdns-recursor -s /sbin/nologin diff --git a/pkgs/pdns-recursor/pdns-recursor.tmpfiles b/pkgs/pdns-recursor/pdns-recursor.tmpfiles new file mode 100644 index 0000000..2fbee00 --- /dev/null +++ b/pkgs/pdns-recursor/pdns-recursor.tmpfiles @@ -0,0 +1 @@ +d /run/pdns-recursor 0755 pdns-recursor pdns-recursor - diff --git a/pkgs/pdns-recursor/recursor.conf b/pkgs/pdns-recursor/recursor.conf new file mode 100644 index 0000000..7ecc30b --- /dev/null +++ b/pkgs/pdns-recursor/recursor.conf @@ -0,0 +1,13 @@ + +# XXX IPv6 listen on :: cannot be created. Says Address is already in use. +local-address=0.0.0.0 ::1 + +socket-dir=/run/pdns-recursor +socket-group=pdns-recursor +socket-owner=pdns-recursor +socket-mode=660 + +# Security settings +chroot=/var/lib/pdns-recursor +setgid=pdns-recursor +setuid=pdns-recursor diff --git a/pkgs/pdns-recursor/systemd/pdns-recursor.service b/pkgs/pdns-recursor/systemd/pdns-recursor.service index b30521e..f0aa1ab 100644 --- a/pkgs/pdns-recursor/systemd/pdns-recursor.service +++ b/pkgs/pdns-recursor/systemd/pdns-recursor.service @@ -4,6 +4,9 @@ After=network.target [Service] ExecStart=/usr/sbin/pdns_recursor --daemon=no +ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.pid +ExecStopPost=/bin/rm -f /run/pdns-recursor/pdns_recursor.controlsocket +Restart=always [Install] WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. bddc81b43c4ee68ed2eb32f23b0b337b0e1f76ab
by git＠ipfire.org 07 Aug '11

07 Aug '11

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 bddc81b43c4ee68ed2eb32f23b0b337b0e1f76ab (commit) via 85ac4216e1a786465e283f2764ad137abd869230 (commit) via b444b20ccfdf8ddb981059e2bc8e560434ee524b (commit) via 8092f272494e25a04e5a410653d8e5715006f0f9 (commit) from 57f898646a9c792ec1865e2b7fdb11ef9a56cbde (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 bddc81b43c4ee68ed2eb32f23b0b337b0e1f76ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Aug 7 22:57:26 2011 +0200 nagios_nrpe: rename nrpe to nagios_nrpe. commit 85ac4216e1a786465e283f2764ad137abd869230 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Aug 6 10:51:15 2011 +0200 nrpe: Split configure options into more lines. commit b444b20ccfdf8ddb981059e2bc8e560434ee524b Merge: 57f8986 8092f27 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Aug 5 16:57:50 2011 +0200 Merge commit 'ms/nrpe' commit 8092f272494e25a04e5a410653d8e5715006f0f9 Author: Gerd Hoerst <gerd(a)hoerst.net> Date: Thu Aug 4 12:53:45 2011 +0200 New package: nrpe plugin for nagios. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/nagios_nrpe | 1 + lfs/{parted => nagios_nrpe} | 14 ++++++++------ make.sh | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 config/rootfiles/packages/nagios_nrpe copy lfs/{parted => nagios_nrpe} (90%) Difference in files: diff --git a/config/rootfiles/packages/nagios_nrpe b/config/rootfiles/packages/nagios_nrpe new file mode 100644 index 0000000..943d8f5 --- /dev/null +++ b/config/rootfiles/packages/nagios_nrpe @@ -0,0 +1 @@ +usr/lib/nagios/check_nrpe diff --git a/lfs/nagios_nrpe b/lfs/nagios_nrpe new file mode 100644 index 0000000..34bc5a8 --- /dev/null +++ b/lfs/nagios_nrpe @@ -0,0 +1,87 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.12 + +THISAPP = nrpe-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +PROG = nagios_nrpe +PAK_VER = 1 + +DEPS = "nagios" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b2d75e2962f1e3151ef58794d60c9e97 + +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) && ./configure --prefix=/usr --libexecdir=/usr/lib/nagios \ + --with-nrpe-user=nobody --with-nrpe-group=nobody \ + --with-nagios-user=nobody --with-nagios-group=nobody + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index a9bc4be..45185ba 100755 --- a/make.sh +++ b/make.sh @@ -615,6 +615,7 @@ buildipfire() { ipfiremake phpSANE ipfiremake tunctl ipfiremake nagios + ipfiremake nagios_nrpe ipfiremake ebtables ipfiremake fontconfig ipfiremake freefont hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0f7866b5e9298bf0a8d39425065985b0f42bda9b
by git＠ipfire.org 07 Aug '11

07 Aug '11

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 0f7866b5e9298bf0a8d39425065985b0f42bda9b (commit) from bbf8af865e6dd38e5856e3d224de951d57aef8e5 (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 0f7866b5e9298bf0a8d39425065985b0f42bda9b Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Aug 7 19:01:56 2011 +0200 openssh: Rework package. * Move binaries from the clients to the base package. * Move systemd unit file to server package. * Add restart option to systemd unit file. Fixes #225 ----------------------------------------------------------------------- Summary of changes: pkgs/openssh/openssh.nm | 35 ++++++++++++++++++++++++--------- pkgs/openssh/systemd/openssh.service | 1 + 2 files changed, 26 insertions(+), 10 deletions(-) Difference in files: diff --git a/pkgs/openssh/openssh.nm b/pkgs/openssh/openssh.nm index 1aa9573..ca079eb 100644 --- a/pkgs/openssh/openssh.nm +++ b/pkgs/openssh/openssh.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = openssh PKG_VER = 5.8p1 -PKG_REL = 7 +PKG_REL = 8 PKG_MAINTAINER = PKG_GROUPS = Application/Internet @@ -55,26 +55,40 @@ PKG_PACKAGES += openssh-clients openssh-server PKG_SUMMARY-openssh-server = OpenSSH server applications. PKG_DESCRIPTION-openssh-server = $(PKG_SUMMARY-openssh-server) PKG_FILES-openssh-server = \ - /etc/init/ \ - /etc/pam.d/ \ + /etc/pam.d/sshd \ /etc/ssh/moduli \ /etc/ssh/sshd_config \ + /lib/systemd/system/openssh.service \ /usr/lib/openssh/sftp-server \ - /usr/sbin/ \ + /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* \ - /usr/share/sshd/ \ - /var/ + /var PKG_SUMMARY-openssh-clients = OpenSSH client applications. PKG_DESCRIPTION-openssh-clients = $(PKG_SUMMARY-openssh-clients) PKG_FILES-openssh-clients = \ - /etc/ \ - /usr/bin/ \ - /usr/lib/ \ - /usr/share/ + /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 # Apply patches in a special order PKG_PATCHES = openssh-5.6p1-redhat.patch @@ -113,3 +127,4 @@ define STAGE_INSTALL_CMDS install -m 754 $(DIR_SOURCE)/ssh-keygen $(BUILDROOT)/usr/lib/openssh/ endef +# XXX User and Group "sshd" needs to be created at the installation of the openssh-server package. diff --git a/pkgs/openssh/systemd/openssh.service b/pkgs/openssh/systemd/openssh.service index 49a2853..7fdd641 100644 --- a/pkgs/openssh/systemd/openssh.service +++ b/pkgs/openssh/systemd/openssh.service @@ -6,6 +6,7 @@ After=network.target ExecStartPre=/usr/lib/openssh/ssh-keygen ExecStart=/usr/sbin/sshd -D ExecReload=/bin/kill -HUP $MAINPID +Restart=always [Install] WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. bbf8af865e6dd38e5856e3d224de951d57aef8e5
by git＠ipfire.org 07 Aug '11

07 Aug '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 09da68fa7600118fc7f46a30689faa69afe1f177
by git＠ipfire.org 07 Aug '11

07 Aug '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e067b858d6948b9cd698804975842ef65e3b3218
by git＠ipfire.org 06 Aug '11

06 Aug '11

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 e067b858d6948b9cd698804975842ef65e3b3218 (commit) via 862634339eebc7b9c502b07d17e4d3cdb96e0ef7 (commit) from 734534fbbf53589f671897dcaf56782d6b38b1fd (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 e067b858d6948b9cd698804975842ef65e3b3218 Merge: 734534f 8626343 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 7 01:05:43 2011 +0200 Merge remote-tracking branch 'stevee/systemd' commit 862634339eebc7b9c502b07d17e4d3cdb96e0ef7 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat Aug 6 22:29:32 2011 +0200 systemd: Update to 33. Fixes #224 ----------------------------------------------------------------------- Summary of changes: ...manpages.patch => systemd-33-no_manpages.patch} | 23 ++++++++++++------- pkgs/systemd/systemd.nm | 9 ++++--- 2 files changed, 19 insertions(+), 13 deletions(-) rename pkgs/systemd/patches/{systemd-29-no-manpages.patch => systemd-33-no_manpages.patch} (84%) Difference in files: diff --git a/pkgs/systemd/patches/systemd-29-no-manpages.patch b/pkgs/systemd/patches/systemd-29-no-manpages.patch deleted file mode 100644 index f935d25..0000000 --- a/pkgs/systemd/patches/systemd-29-no-manpages.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2011-06-16 13:17:51.000000000 +0200 -+++ b/Makefile.am 2011-07-10 19:09:54.169403422 +0200 -@@ -565,79 +565,13 @@ - src/readahead-common.h \ - src/ask-password-api.h - --MANPAGES = \ -- man/systemd.1 \ -- man/systemctl.1 \ -- man/systemadm.1 \ -- man/systemd-cgls.1 \ -- man/systemd-nspawn.1 \ -- man/systemd-tmpfiles.8 \ -- man/systemd-notify.1 \ -- man/sd_notify.3 \ -- man/sd_readahead.3 \ -- man/sd_booted.3 \ -- man/sd_listen_fds.3 \ -- man/sd_is_fifo.3 \ -- man/systemd.unit.5 \ -- man/systemd.service.5 \ -- man/systemd.socket.5 \ -- man/systemd.mount.5 \ -- man/systemd.automount.5 \ -- man/systemd.swap.5 \ -- man/systemd.timer.5 \ -- man/systemd.path.5 \ -- man/systemd.target.5 \ -- man/systemd.device.5 \ -- man/systemd.snapshot.5 \ -- man/systemd.exec.5 \ -- man/daemon.7 \ -- man/sd-daemon.7 \ -- man/sd-readahead.7 \ -- man/runlevel.8 \ -- man/telinit.8 \ -- man/halt.8 \ -- man/shutdown.8 \ -- man/pam_systemd.8 \ -- man/systemd.conf.5 \ -- man/tmpfiles.d.5 \ -- man/hostname.5 \ -- man/machine-id.5 \ -- man/vconsole.conf.5 \ -- man/locale.conf.5 \ -- man/os-release.5 \ -- man/machine-info.5 \ -- man/modules-load.d.5 \ -- man/sysctl.d.5 \ -- man/systemd-ask-password.1 -+MANPAGES = - --if ENABLE_BINFMT --MANPAGES += \ -- man/binfmt.d.5 --endif -+MANPAGES_ALIAS = - --MANPAGES_ALIAS = \ -- man/reboot.8 \ -- man/poweroff.8 \ -- man/sd_is_socket.3 \ -- man/sd_is_socket_unix.3 \ -- man/sd_is_socket_inet.3 \ -- man/sd_notifyf.3 \ -- man/init.1 -- --man/reboot.8: man/halt.8 --man/poweroff.8: man/halt.8 --man/sd_is_socket.3: man/sd_is_fifo.3 --man/sd_is_socket_unix.3: man/sd_is_fifo.3 --man/sd_is_socket_inet.3: man/sd_is_fifo.3 --man/sd_notifyf.3: man/sd_notify.3 --man/init.1: man/systemd.1 -- --dist_man_MANS = \ -- $(MANPAGES) \ -- $(MANPAGES_ALIAS) -+dist_man_MANS = - --nodist_man_MANS = \ -- man/systemd.special.7 -+nodist_man_MANS = - - XML_FILES = \ - ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/patches/systemd-33-no_manpages.patch b/pkgs/systemd/patches/systemd-33-no_manpages.patch new file mode 100644 index 0000000..b416d80 --- /dev/null +++ b/pkgs/systemd/patches/systemd-33-no_manpages.patch @@ -0,0 +1,92 @@ +diff -Nur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2011-08-03 04:19:53.000000000 +0200 ++++ b/Makefile.am 2011-08-05 19:41:33.923993685 +0200 +@@ -692,81 +692,18 @@ + src/dbus-loop.h \ + src/spawn-agent.h + +-MANPAGES = \ +- man/systemd.1 \ +- man/systemctl.1 \ +- man/systemadm.1 \ +- man/systemd-cgls.1 \ +- man/systemd-nspawn.1 \ +- man/systemd-tmpfiles.8 \ +- man/systemd-notify.1 \ +- man/sd_notify.3 \ +- man/sd_readahead.3 \ +- man/sd_booted.3 \ +- man/sd_listen_fds.3 \ +- man/sd_is_fifo.3 \ +- man/systemd.unit.5 \ +- man/systemd.service.5 \ +- man/systemd.socket.5 \ +- man/systemd.mount.5 \ +- man/systemd.automount.5 \ +- man/systemd.swap.5 \ +- man/systemd.timer.5 \ +- man/systemd.path.5 \ +- man/systemd.target.5 \ +- man/systemd.device.5 \ +- man/systemd.snapshot.5 \ +- man/systemd.exec.5 \ +- man/daemon.7 \ +- man/sd-daemon.7 \ +- man/sd-readahead.7 \ +- man/runlevel.8 \ +- man/telinit.8 \ +- man/halt.8 \ +- man/shutdown.8 \ +- man/pam_systemd.8 \ +- man/systemd.conf.5 \ +- man/systemd-logind.conf.5 \ +- man/tmpfiles.d.5 \ +- man/hostname.5 \ +- man/machine-id.5 \ +- man/vconsole.conf.5 \ +- man/locale.conf.5 \ +- man/os-release.5 \ +- man/machine-info.5 \ +- man/modules-load.d.5 \ +- man/sysctl.d.5 \ +- man/systemd-ask-password.1 \ +- man/systemd-loginctl.1 ++MANPAGES = + + if ENABLE_BINFMT +-MANPAGES += \ +- man/binfmt.d.5 ++MANPAGES += ++ + endif + +-MANPAGES_ALIAS = \ +- man/reboot.8 \ +- man/poweroff.8 \ +- man/sd_is_socket.3 \ +- man/sd_is_socket_unix.3 \ +- man/sd_is_socket_inet.3 \ +- man/sd_notifyf.3 \ +- man/init.1 +- +-man/reboot.8: man/halt.8 +-man/poweroff.8: man/halt.8 +-man/sd_is_socket.3: man/sd_is_fifo.3 +-man/sd_is_socket_unix.3: man/sd_is_fifo.3 +-man/sd_is_socket_inet.3: man/sd_is_fifo.3 +-man/sd_notifyf.3: man/sd_notify.3 +-man/init.1: man/systemd.1 +- +-dist_man_MANS = \ +- $(MANPAGES) \ +- $(MANPAGES_ALIAS) ++MANPAGES_ALIAS = ++ ++dist_man_MANS = + +-nodist_man_MANS = \ +- man/systemd.special.7 ++nodist_man_MANS = + + XML_FILES = \ + ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} diff --git a/pkgs/systemd/systemd.nm b/pkgs/systemd/systemd.nm index bc24e14..a19df40 100644 --- a/pkgs/systemd/systemd.nm +++ b/pkgs/systemd/systemd.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = systemd -PKG_VER = 29 -PKG_REL = 4 +PKG_VER = 33 +PKG_REL = 1 PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUPS = System/Base @@ -35,10 +35,11 @@ PKG_LICENSE = GPLv2+ PKG_SUMMARY = A System and Service Manager. PKG_BUILD_DEPS+= audit-devel automake autoconf cryptsetup-luks-devel dbus-devel \ - libcap-devel libselinux-devel libtool libudev-devel pam-devel + gperf intltool libcap-devel libselinux-devel libtool libudev-devel>=172 \ + pam-devel # systemd-analyze requires python-cairo + python-dbus -PKG_DEPS-systemd = dbus python-cairo python-dbus +PKG_DEPS-systemd = dbus python-cairo python-dbus udev>=172 define PKG_DESCRIPTION systemd is a system and service manager for Linux, compatible with \ hooks/post-receive -- IPFire 3.x development tree

1 0

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

06 Aug '11

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 b297f5173ba06aef477d8a7bdc7e49cdc4c4f399 (commit) from f99f4293e7ccb913105be165ddf25ea90bf676d4 (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 b297f5173ba06aef477d8a7bdc7e49cdc4c4f399 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 19:14:26 2011 +0200 libsatsolver -> libsolv as the latter is used by pakfire 3 now. ----------------------------------------------------------------------- Summary of changes: lfs/{libsatsolver => libsolv} | 19 +++-- make.sh | 2 +- .../libsatsolver-Build-only-libraries.patch | 26 ------ ...e-libsatsolver-ext-a-versioned-shared-lib.patch | 94 -------------------- 4 files changed, 12 insertions(+), 129 deletions(-) rename lfs/{libsatsolver => libsolv} (88%) delete mode 100644 src/patches/libsatsolver-Build-only-libraries.patch delete mode 100644 src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch Difference in files: diff --git a/lfs/libsatsolver b/lfs/libsatsolver deleted file mode 100644 index bdae271..0000000 --- a/lfs/libsatsolver +++ /dev/null @@ -1,108 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.16.4-c57e9df - -THISAPP = libsatsolver-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -PROG = libsatsolver -DEPS = "" -PAK_VER = 2 - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 756cae7df92fd3faa0a49883378d8c98 - -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) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Build-only-libraries.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch - - # Who releases code with -Werror? - cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt - - # Make sure that libsatsolverext is linked properly to all needed - # libraries. - cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(satsolverext satsolver \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \ - >> ext/CMakeLists.txt - - # Remove the RPM stuff when we build with -DFEDORA=1 because we - # do not support RPM. - cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt - - # Our version of glibc has no __qsort_r - cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h - - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) - - cd $(DIR_APP)/build && make install - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/libsolv b/lfs/libsolv new file mode 100644 index 0000000..b602095 --- /dev/null +++ b/lfs/libsolv @@ -0,0 +1,111 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.0.0-0db9d7f + +THISAPP = libsolv-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +PROG = libsolv +DEPS = "" +PAK_VER = 1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ba95c404d807bc71297c508a7127a3d9 + +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) + + # Who releases code with -Werror? + cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt + + # Disable bindings, examples and tools. + cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt + + # Make sure that libsatsolverext is linked properly to all needed + # libraries. + cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \ + >> ext/CMakeLists.txt + + # Remove the RPM stuff when we build with -DFEDORA=1 because we + # do not support RPM. + cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt + + # Our version of glibc has no __qsort_r + cd $(DIR_APP) && echo "#define USE_OWN_QSORT" >> src/util.h + + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) + + cd $(DIR_APP)/build && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index b2eea71..178fd71 100755 --- a/make.sh +++ b/make.sh @@ -692,7 +692,7 @@ buildipfire() { ipfiremake python-m2crypto ipfiremake wireless-regdb ipfiremake crda - ipfiremake libsatsolver + ipfiremake libsolv ipfiremake python-distutils-extra ipfiremake python-lzma ipfiremake python-progressbar diff --git a/src/patches/libsatsolver-Build-only-libraries.patch b/src/patches/libsatsolver-Build-only-libraries.patch deleted file mode 100644 index 47e24e4..0000000 --- a/src/patches/libsatsolver-Build-only-libraries.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2011-04-10 23:55:09.506257000 +0200 -+++ new/CMakeLists.txt 2011-04-10 23:46:30.612257002 +0200 -@@ -32,7 +32,7 @@ - INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) - - FIND_PACKAGE(EXPAT REQUIRED) --FIND_PACKAGE(Check REQUIRED) -+#FIND_PACKAGE(Check REQUIRED) - FIND_PACKAGE(ZLIB REQUIRED) - - IF ( FEDORA ) -@@ -190,10 +190,10 @@ - - ADD_SUBDIRECTORY(src) - ADD_SUBDIRECTORY(ext) --ADD_SUBDIRECTORY(tools) --ADD_SUBDIRECTORY(tests) --ADD_SUBDIRECTORY(examples) --ADD_SUBDIRECTORY(doc) -+#ADD_SUBDIRECTORY(tools) -+#ADD_SUBDIRECTORY(tests) -+#ADD_SUBDIRECTORY(examples) -+#ADD_SUBDIRECTORY(doc) - - MESSAGE(STATUS "version: ${VERSION}") diff --git a/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch b/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch deleted file mode 100644 index 449275c..0000000 --- a/src/patches/libsatsolver-Make-libsatsolver-ext-a-versioned-shared-lib.patch +++ /dev/null @@ -1,94 +0,0 @@ ->From 1f9659b55013f222046b9d161fd5a0f2fc399cb8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 21 Apr 2011 12:48:41 +0200 -Subject: [PATCH] Make libsatsolver{,ext} a versioned shared lib. - -Most distributions only do accept shared libraries because of -relro and hardening stuff. - -Previously, libsatsolver was statically compiled because the ABI -was assumed to be changed from time to time but has now become -very stable. - -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - ext/CMakeLists.txt | 6 +++++- - src/CMakeLists.txt | 6 +++++- - tools/CMakeLists.txt | 12 ++++++------ - 3 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 8e71eee..68e1c3c 100644 ---- a/ext/CMakeLists.txt -+++ b/ext/CMakeLists.txt -@@ -8,7 +8,11 @@ SET(libsatsolverext_SRCS - ${libsatsolverext_SRCS} pool_fileconflicts.c repo_rpmdb.c) - ENDIF (NOT DEBIAN) - --ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS}) -+ADD_LIBRARY(satsolverext SHARED ${libsatsolverext_SRCS}) -+SET_TARGET_PROPERTIES(satsolverext PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolverext_HEADERS - pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_helix.h repo_products.h -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9bd0fde..6a14d10 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,11 @@ SET(libsatsolver_SRCS - transaction.c rules.c problems.c - chksum.c md5.c sha1.c sha2.c satversion.c) - --ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) -+ADD_LIBRARY(satsolver SHARED ${libsatsolver_SRCS}) -+SET_TARGET_PROPERTIES(satsolver PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolver_HEADERS - bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 79d4890..7696612 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -20,19 +20,19 @@ ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c) - TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(helix2solv helix2solv.c) --TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(susetags2solv susetags2solv.c) --TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY}) -+TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c) --TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c) --TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c) --TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(installcheck installcheck.c) - TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -@@ -44,7 +44,7 @@ ADD_EXECUTABLE(dumpsolv dumpsolv.c ) - TARGET_LINK_LIBRARIES(dumpsolv satsolver) - - ADD_EXECUTABLE(mergesolv mergesolv.c ) --TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver) -+TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - install(TARGETS - mergesolv --- -1.7.4.4 - hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 734534fbbf53589f671897dcaf56782d6b38b1fd
by git＠ipfire.org 06 Aug '11

06 Aug '11

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 734534fbbf53589f671897dcaf56782d6b38b1fd (commit) via fd79f07265f82418133cb897884cee9646b882a5 (commit) via 1fc81377803ed4a2e33950984a966e1c10366563 (commit) from c9b0b55d4f2a45232dec9271b000c15e33da24d0 (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 734534fbbf53589f671897dcaf56782d6b38b1fd Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 12:23:34 2011 +0200 Remove libsatsolver. This is no more needed. commit fd79f07265f82418133cb897884cee9646b882a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 12:22:34 2011 +0200 pakfire: Update to 0.9.6. Using libsolv now. commit 1fc81377803ed4a2e33950984a966e1c10366563 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Aug 6 12:22:21 2011 +0200 libsolv: New package replacing libsatsolver. ----------------------------------------------------------------------- Summary of changes: .../patches/0001-Build-only-libraries.patch | 26 ------ ...e-libsatsolver-ext-a-versioned-shared-lib.patch | 94 -------------------- .../libsatsolver.nm => libsolv/libsolv.nm} | 31 ++++--- pkgs/pakfire/pakfire.nm | 11 ++- 4 files changed, 26 insertions(+), 136 deletions(-) delete mode 100644 pkgs/libsatsolver/patches/0001-Build-only-libraries.patch delete mode 100644 pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch rename pkgs/{libsatsolver/libsatsolver.nm => libsolv/libsolv.nm} (77%) Difference in files: diff --git a/pkgs/libsatsolver/libsatsolver.nm b/pkgs/libsatsolver/libsatsolver.nm deleted file mode 100644 index 3b33806..0000000 --- a/pkgs/libsatsolver/libsatsolver.nm +++ /dev/null @@ -1,75 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# 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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = libsatsolver -PKG_VER = 0.16.4 -GIT_VER = c57e9df -PKG_REL = 5 - -PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> -PKG_GROUPS = System/Libraries -PKG_URL = http://gitorious.org/opensuse/sat-solver -PKG_LICENSE = BSD -PKG_SUMMARY = A SAT solver written in C++. - -PKG_BUILD_DEPS+= gcc-c++ cmake db4-devel expat-devel zlib-devel - -define PKG_DESCRIPTION - This package contains a very fast SAT resolver written in C++. -endef - -THISAPP = $(PKG_NAME)-$(PKG_VER)-$(GIT_VER) -PKG_TARBALL = $(THISAPP).tar.xz - -PKG_PACKAGES += $(PKG_NAME)-devel - -define STAGE_PREPARE_CMDS - # Who releases code with -Werror? - cd $(DIR_APP) && sed -e "s/-Werror//g" -i CMakeLists.txt - - # Make sure that libsatsolverext is linked properly to all needed - # libraries. - cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(satsolverext satsolver \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \ - >> ext/CMakeLists.txt - - # Remove the RPM stuff when we build with -DFEDORA=1 because we - # do not support RPM. - cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt -endef - -# Define debian as distro to get weak of rpm header files. -define STAGE_BUILD - cd $(DIR_APP) && mkdir build - cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=1 - cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) -endef - -define STAGE_INSTALL - cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT) -endef diff --git a/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch b/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch deleted file mode 100644 index 47e24e4..0000000 --- a/pkgs/libsatsolver/patches/0001-Build-only-libraries.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur old/CMakeLists.txt new/CMakeLists.txt ---- old/CMakeLists.txt 2011-04-10 23:55:09.506257000 +0200 -+++ new/CMakeLists.txt 2011-04-10 23:46:30.612257002 +0200 -@@ -32,7 +32,7 @@ - INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake ) - - FIND_PACKAGE(EXPAT REQUIRED) --FIND_PACKAGE(Check REQUIRED) -+#FIND_PACKAGE(Check REQUIRED) - FIND_PACKAGE(ZLIB REQUIRED) - - IF ( FEDORA ) -@@ -190,10 +190,10 @@ - - ADD_SUBDIRECTORY(src) - ADD_SUBDIRECTORY(ext) --ADD_SUBDIRECTORY(tools) --ADD_SUBDIRECTORY(tests) --ADD_SUBDIRECTORY(examples) --ADD_SUBDIRECTORY(doc) -+#ADD_SUBDIRECTORY(tools) -+#ADD_SUBDIRECTORY(tests) -+#ADD_SUBDIRECTORY(examples) -+#ADD_SUBDIRECTORY(doc) - - MESSAGE(STATUS "version: ${VERSION}") diff --git a/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch b/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch deleted file mode 100644 index 449275c..0000000 --- a/pkgs/libsatsolver/patches/0001-Make-libsatsolver-ext-a-versioned-shared-lib.patch +++ /dev/null @@ -1,94 +0,0 @@ ->From 1f9659b55013f222046b9d161fd5a0f2fc399cb8 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 21 Apr 2011 12:48:41 +0200 -Subject: [PATCH] Make libsatsolver{,ext} a versioned shared lib. - -Most distributions only do accept shared libraries because of -relro and hardening stuff. - -Previously, libsatsolver was statically compiled because the ABI -was assumed to be changed from time to time but has now become -very stable. - -Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ---- - ext/CMakeLists.txt | 6 +++++- - src/CMakeLists.txt | 6 +++++- - tools/CMakeLists.txt | 12 ++++++------ - 3 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt -index 8e71eee..68e1c3c 100644 ---- a/ext/CMakeLists.txt -+++ b/ext/CMakeLists.txt -@@ -8,7 +8,11 @@ SET(libsatsolverext_SRCS - ${libsatsolverext_SRCS} pool_fileconflicts.c repo_rpmdb.c) - ENDIF (NOT DEBIAN) - --ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS}) -+ADD_LIBRARY(satsolverext SHARED ${libsatsolverext_SRCS}) -+SET_TARGET_PROPERTIES(satsolverext PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolverext_HEADERS - pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_helix.h repo_products.h -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9bd0fde..6a14d10 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -6,7 +6,11 @@ SET(libsatsolver_SRCS - transaction.c rules.c problems.c - chksum.c md5.c sha1.c sha2.c satversion.c) - --ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) -+ADD_LIBRARY(satsolver SHARED ${libsatsolver_SRCS}) -+SET_TARGET_PROPERTIES(satsolver PROPERTIES -+ VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}" -+ SOVERSION "${LIBSATSOLVER_MAJOR}" -+) - - SET(libsatsolver_HEADERS - bitmap.h evr.h hash.h policy.h poolarch.h poolvendor.h pool.h -diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt -index 79d4890..7696612 100644 ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -20,19 +20,19 @@ ADD_EXECUTABLE(rpmmd2solv rpmmd2solv.c) - TARGET_LINK_LIBRARIES(rpmmd2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(helix2solv helix2solv.c) --TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(helix2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(susetags2solv susetags2solv.c) --TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${ZLIB_LIBRARY}) -+TARGET_LINK_LIBRARIES(susetags2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(updateinfoxml2solv updateinfoxml2solv.c) --TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(updateinfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(deltainfoxml2solv deltainfoxml2solv.c) --TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(deltainfoxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(repomdxml2solv repomdxml2solv.c) --TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY}) -+TARGET_LINK_LIBRARIES(repomdxml2solv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - ADD_EXECUTABLE(installcheck installcheck.c) - TARGET_LINK_LIBRARIES(installcheck satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) -@@ -44,7 +44,7 @@ ADD_EXECUTABLE(dumpsolv dumpsolv.c ) - TARGET_LINK_LIBRARIES(dumpsolv satsolver) - - ADD_EXECUTABLE(mergesolv mergesolv.c ) --TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver) -+TARGET_LINK_LIBRARIES(mergesolv toolstuff satsolverext satsolver ${EXPAT_LIBRARY} ${ZLIB_LIBRARY}) - - install(TARGETS - mergesolv --- -1.7.4.4 - diff --git a/pkgs/libsolv/libsolv.nm b/pkgs/libsolv/libsolv.nm new file mode 100644 index 0000000..d017560 --- /dev/null +++ b/pkgs/libsolv/libsolv.nm @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libsolv +PKG_VER = 0.0.0 +GIT_VER = 0db9d7f +PKG_REL = 1 + +PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> +PKG_GROUPS = System/Libraries +PKG_URL = https://github.com/openSUSE/libsolv +PKG_LICENSE = BSD +PKG_SUMMARY = A library for solving package dependencies. + +PKG_BUILD_DEPS+= gcc-c++ cmake db4-devel expat-devel zlib-devel + +define PKG_DESCRIPTION + A library for solving package dependencies by using a SAT + resolver written in C++. +endef + +THISAPP = $(PKG_NAME)-$(PKG_VER)-$(GIT_VER) +PKG_TARBALL = $(THISAPP).tar.gz + +PKG_PACKAGES += $(PKG_NAME)-devel + +define STAGE_PREPARE_CMDS + # Do not build bindings, examples and tools. + cd $(DIR_APP) && sed "/bindings/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/examples/d" -i CMakeLists.txt + cd $(DIR_APP) && sed "/tools/d" -i CMakeLists.txt + + # Make sure that libsatsolverext is linked properly to all needed + # libraries. + cd $(DIR_APP) && echo "TARGET_LINK_LIBRARIES(libsolvext libsolv \$${EXPAT_LIBRARY} \$${ZLIB_LIBRARY})" \ + >> ext/CMakeLists.txt + + # Remove the RPM stuff when we build with -DFEDORA=1 because we + # do not support RPM. + cd $(DIR_APP) && sed -e "s/DEBIAN/FEDORA/g" -i ext/CMakeLists.txt +endef + +define STAGE_BUILD + cd $(DIR_APP) && mkdir build + cd $(DIR_APP)/build && cmake .. -DFEDORA=1 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 + cd $(DIR_APP)/build && make $(PARALELLISMFLAGS) +endef + +define STAGE_INSTALL + cd $(DIR_APP)/build && make install DESTDIR=$(BUILDROOT) + + # Remove unusable header. + rm -vf $(BUILDROOT)/usr/include/solv/repo_rpmdb.h +endef diff --git a/pkgs/pakfire/pakfire.nm b/pkgs/pakfire/pakfire.nm index c0e14c2..fadcd9d 100644 --- a/pkgs/pakfire/pakfire.nm +++ b/pkgs/pakfire/pakfire.nm @@ -25,8 +25,8 @@ include $(PKGROOT)/Include PKG_NAME = pakfire -PKG_VER = 0.9.4 -PKG_REL = 2 +PKG_VER = 0.9.6 +PKG_REL = 1 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUPS = Base System/Packaging @@ -36,7 +36,7 @@ PKG_SUMMARY = Package installer/updater. PKG_BUILD_DEPS+= \ intltool \ - libsatsolver-devel>=0.16.4-5 \ + libsolv-devel \ python-devel \ python-distutils-extra @@ -56,6 +56,11 @@ PKG_TARBALL = $(THISAPP).tar.gz export CFLAGS += -fno-strict-aliasing +define STAGE_TEST + # Check, if the binary module is loadable. + cd $(DIR_APP)/build/lib*/pakfire/ && python -c "import _pakfire" +endef + # Build package PKG_PACKAGES += $(PKG_NAME)-build 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 August 2011