From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 30b980a84dd89aea8d49ad5d93b2b033c38f48e8 Date: Tue, 11 Apr 2017 14:25:14 +0100 Message-ID: <20170411132515.690F610853C3@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5219772946637817738==" List-Id: --===============5219772946637817738== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 30b980a84dd89aea8d49ad5d93b2b033c38f48e8 (commit) via a696f575104e9bca3ae6df6d36f01b9a63c6c70c (commit) via f0c71e72b0f84400127d7ebc9e34f2805ebbec81 (commit) via c4f3b29a9de4ced24110c39f818afd59c977d296 (commit) via 015640d67161b27e729e6bc31b32eb838afd5060 (commit) via 778979f630b0157f7bcee40087a80dae6076c4b4 (commit) from a0168f9fca199e78bf88ab263deaec3a2c8e977e (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 30b980a84dd89aea8d49ad5d93b2b033c38f48e8 Author: Matthias Fischer Date: Mon Apr 10 14:10:28 2017 +0200 kbd 1.12: Update for rootfile =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit a696f575104e9bca3ae6df6d36f01b9a63c6c70c Author: Matthias Fischer Date: Sun Apr 9 18:19:49 2017 +0200 rrdtool 1.6.0: fix for rootfile =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit f0c71e72b0f84400127d7ebc9e34f2805ebbec81 Author: Michael Tremer Date: Tue Apr 11 14:11:16 2017 +0100 ltrace: New package =20 Signed-off-by: Michael Tremer commit c4f3b29a9de4ced24110c39f818afd59c977d296 Author: Michael Tremer Date: Tue Apr 11 14:10:53 2017 +0100 elfutils: Update rootfile =20 Signed-off-by: Michael Tremer commit 015640d67161b27e729e6bc31b32eb838afd5060 Author: Michael Tremer Date: Tue Apr 11 13:05:53 2017 +0100 elfutils: New package =20 Signed-off-by: Michael Tremer commit 778979f630b0157f7bcee40087a80dae6076c4b4 Author: Michael Tremer Date: Tue Apr 11 13:05:22 2017 +0100 dbus: Update to 1.11.12 =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/kbd | 28 +++++------ config/rootfiles/common/rrdtool | 1 + config/rootfiles/packages/avahi | 1 + config/rootfiles/packages/dbus | 40 +++++++++------ config/rootfiles/packages/elfutils | 80 ++++++++++++++++++++++++++++= ++ config/rootfiles/packages/ltrace | 10 ++++ lfs/dbus | 8 +-- lfs/{strace =3D> elfutils} | 10 ++-- lfs/{strace =3D> ltrace} | 15 +++--- make.sh | 2 + src/paks/dbus/install.sh | 8 ++- src/paks/dbus/uninstall.sh | 4 ++ src/patches/dbus-1.0.3-compile-fix-1.patch | 11 ---- 13 files changed, 162 insertions(+), 56 deletions(-) create mode 100644 config/rootfiles/packages/elfutils create mode 100644 config/rootfiles/packages/ltrace copy lfs/{strace =3D> elfutils} (95%) copy lfs/{strace =3D> ltrace} (91%) delete mode 100644 src/patches/dbus-1.0.3-compile-fix-1.patch Difference in files: diff --git a/config/rootfiles/common/kbd b/config/rootfiles/common/kbd index 5f694ff..d8d7657 100644 --- a/config/rootfiles/common/kbd +++ b/config/rootfiles/common/kbd @@ -19,7 +19,7 @@ bin/setfont #lib/kbd/consolefonts/Cyr_a8x14.psfu.gz #lib/kbd/consolefonts/Cyr_a8x16.psfu.gz #lib/kbd/consolefonts/Cyr_a8x8.psfu.gz -#lib/kbd/consolefonts/ERRORS +#lib/kbd/consolefonts/ERRORS.gz #lib/kbd/consolefonts/Goha-12.psfu.gz #lib/kbd/consolefonts/Goha-14.psfu.gz #lib/kbd/consolefonts/Goha-16.psfu.gz @@ -32,19 +32,19 @@ lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz #lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz #lib/kbd/consolefonts/Mik_8x16.gz -#lib/kbd/consolefonts/README.12x22 -#lib/kbd/consolefonts/README.Arabic -#lib/kbd/consolefonts/README.Cyrillic -#lib/kbd/consolefonts/README.Ethiopic -#lib/kbd/consolefonts/README.Greek -#lib/kbd/consolefonts/README.Hebrew -#lib/kbd/consolefonts/README.cp1250 -#lib/kbd/consolefonts/README.cybercafe -#lib/kbd/consolefonts/README.drdos -#lib/kbd/consolefonts/README.lat0 -#lib/kbd/consolefonts/README.lat7 -#lib/kbd/consolefonts/README.lat9 -#lib/kbd/consolefonts/README.psfu +#lib/kbd/consolefonts/README.12x22.gz +#lib/kbd/consolefonts/README.Arabic.gz +#lib/kbd/consolefonts/README.Cyrillic.gz +#lib/kbd/consolefonts/README.Ethiopic.gz +#lib/kbd/consolefonts/README.Greek.gz +#lib/kbd/consolefonts/README.Hebrew.gz +#lib/kbd/consolefonts/README.cp1250.gz +#lib/kbd/consolefonts/README.cybercafe.gz +#lib/kbd/consolefonts/README.drdos.gz +#lib/kbd/consolefonts/README.lat0.gz +#lib/kbd/consolefonts/README.lat7.gz +#lib/kbd/consolefonts/README.lat9.gz +#lib/kbd/consolefonts/README.psfu.gz #lib/kbd/consolefonts/alt-8x14.gz #lib/kbd/consolefonts/alt-8x16.gz #lib/kbd/consolefonts/alt-8x8.gz diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index edb576a..4254b2e 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -18,6 +18,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/R= RDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp/.packli= st #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/.packli= st +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc #usr/share/doc/rrdtool-1.6.0 diff --git a/config/rootfiles/packages/avahi b/config/rootfiles/packages/avahi index 4a3b572..d70af5a 100644 --- a/config/rootfiles/packages/avahi +++ b/config/rootfiles/packages/avahi @@ -7,6 +7,7 @@ etc/avahi/services etc/avahi/services/sftp-ssh.service etc/avahi/services/smb.service etc/avahi/services/ssh.service +#etc/dbus-1/system.d etc/dbus-1/system.d/avahi-dbus.conf etc/rc.d/init.d/avahi usr/bin/avahi-browse diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus index b252653..2196768 100644 --- a/config/rootfiles/packages/dbus +++ b/config/rootfiles/packages/dbus @@ -1,17 +1,15 @@ -etc/rc.d/init.d/messagebus -etc/rc.d/rc3.d/S15messagebus -etc/rc.d/rc0.d/K85messagebus -etc/rc.d/rc6.d/K85messagebus #etc/dbus-1 etc/dbus-1/session.conf -etc/dbus-1/session.d etc/dbus-1/system.conf -etc/dbus-1/system.d +etc/rc.d/init.d/messagebus usr/bin/dbus-cleanup-sockets usr/bin/dbus-daemon usr/bin/dbus-launch usr/bin/dbus-monitor +usr/bin/dbus-run-session usr/bin/dbus-send +usr/bin/dbus-test-tool +usr/bin/dbus-update-activation-environment usr/bin/dbus-uuidgen #usr/include/dbus-1.0 #usr/include/dbus-1.0/dbus @@ -28,9 +26,13 @@ usr/bin/dbus-uuidgen #usr/include/dbus-1.0/dbus/dbus-server.h #usr/include/dbus-1.0/dbus/dbus-shared.h #usr/include/dbus-1.0/dbus/dbus-signature.h +#usr/include/dbus-1.0/dbus/dbus-syntax.h #usr/include/dbus-1.0/dbus/dbus-threads.h #usr/include/dbus-1.0/dbus/dbus-types.h #usr/include/dbus-1.0/dbus/dbus.h +#usr/lib/cmake/DBus1 +#usr/lib/cmake/DBus1/DBus1Config.cmake +#usr/lib/cmake/DBus1/DBus1ConfigVersion.cmake #usr/lib/dbus-1.0 #usr/lib/dbus-1.0/include #usr/lib/dbus-1.0/include/dbus @@ -39,15 +41,25 @@ usr/bin/dbus-uuidgen #usr/lib/libdbus-1.la usr/lib/libdbus-1.so usr/lib/libdbus-1.so.3 -usr/lib/libdbus-1.so.3.2.0 +usr/lib/libdbus-1.so.3.16.4 #usr/lib/pkgconfig/dbus-1.pc +usr/libexec/dbus-daemon-launch-helper #usr/share/dbus-1 usr/share/dbus-1/services -#usr/share/man/man1/dbus-cleanup-sockets.1 -#usr/share/man/man1/dbus-daemon.1 -#usr/share/man/man1/dbus-launch.1 -#usr/share/man/man1/dbus-monitor.1 -#usr/share/man/man1/dbus-send.1 -#usr/share/man/man1/dbus-uuidgen.1 +usr/share/dbus-1/session.conf +usr/share/dbus-1/session.d +usr/share/dbus-1/system-services +usr/share/dbus-1/system.conf +usr/share/dbus-1/system.d +#usr/share/doc/dbus +#usr/share/doc/dbus/diagram.png +#usr/share/doc/dbus/diagram.svg +#usr/share/doc/dbus/examples +#usr/share/doc/dbus/examples/GetAllMatchRules.py +#usr/share/doc/dbus/examples/example-session-disable-stats.conf +#usr/share/doc/dbus/examples/example-system-enable-stats.conf +#usr/share/doc/dbus/system-activation.txt +#usr/share/xml/dbus-1 +#usr/share/xml/dbus-1/busconfig.dtd +#usr/share/xml/dbus-1/introspect.dtd var/lib/dbus -#var/run/dbus diff --git a/config/rootfiles/packages/elfutils b/config/rootfiles/packages/e= lfutils new file mode 100644 index 0000000..ac6d1cc --- /dev/null +++ b/config/rootfiles/packages/elfutils @@ -0,0 +1,80 @@ +usr/bin/eu-addr2line +usr/bin/eu-ar +usr/bin/eu-elfcmp +usr/bin/eu-elfcompress +usr/bin/eu-elflint +usr/bin/eu-findtextrel +usr/bin/eu-make-debug-archive +usr/bin/eu-nm +usr/bin/eu-objdump +usr/bin/eu-ranlib +usr/bin/eu-readelf +usr/bin/eu-size +usr/bin/eu-stack +usr/bin/eu-strings +usr/bin/eu-strip +usr/bin/eu-unstrip +#usr/include/dwarf.h +#usr/include/elfutils +#usr/include/elfutils/elf-knowledge.h +#usr/include/elfutils/known-dwarf.h +#usr/include/elfutils/libasm.h +#usr/include/elfutils/libdw.h +#usr/include/elfutils/libdwelf.h +#usr/include/elfutils/libdwfl.h +#usr/include/elfutils/libebl.h +#usr/include/elfutils/version.h +#usr/include/gelf.h +#usr/include/libelf.h +#usr/include/nlist.h +usr/lib/elfutils +#usr/lib/elfutils/libebl_aarch64-0.168.so +#usr/lib/elfutils/libebl_aarch64.so +#usr/lib/elfutils/libebl_alpha-0.168.so +#usr/lib/elfutils/libebl_alpha.so +#usr/lib/elfutils/libebl_arm-0.168.so +#usr/lib/elfutils/libebl_arm.so +#usr/lib/elfutils/libebl_bpf-0.168.so +#usr/lib/elfutils/libebl_bpf.so +#usr/lib/elfutils/libebl_i386-0.168.so +#usr/lib/elfutils/libebl_i386.so +#usr/lib/elfutils/libebl_ia64-0.168.so +#usr/lib/elfutils/libebl_ia64.so +#usr/lib/elfutils/libebl_m68k-0.168.so +#usr/lib/elfutils/libebl_m68k.so +#usr/lib/elfutils/libebl_ppc-0.168.so +#usr/lib/elfutils/libebl_ppc.so +#usr/lib/elfutils/libebl_ppc64-0.168.so +#usr/lib/elfutils/libebl_ppc64.so +#usr/lib/elfutils/libebl_s390-0.168.so +#usr/lib/elfutils/libebl_s390.so +#usr/lib/elfutils/libebl_sh-0.168.so +#usr/lib/elfutils/libebl_sh.so +#usr/lib/elfutils/libebl_sparc-0.168.so +#usr/lib/elfutils/libebl_sparc.so +#usr/lib/elfutils/libebl_tilegx-0.168.so +#usr/lib/elfutils/libebl_tilegx.so +#usr/lib/elfutils/libebl_x86_64-0.168.so +#usr/lib/elfutils/libebl_x86_64.so +usr/lib/libasm-0.168.so +#usr/lib/libasm.a +usr/lib/libasm.so +usr/lib/libasm.so.1 +usr/lib/libdw-0.168.so +#usr/lib/libdw.a +usr/lib/libdw.so +usr/lib/libdw.so.1 +#usr/lib/libebl.a +usr/lib/libelf-0.168.so +#usr/lib/libelf.a +usr/lib/libelf.so +usr/lib/libelf.so.1 +#usr/lib/pkgconfig/libdw.pc +#usr/lib/pkgconfig/libelf.pc +#usr/share/locale/de/LC_MESSAGES/elfutils.mo +#usr/share/locale/en(a)boldquot/LC_MESSAGES/elfutils.mo +#usr/share/locale/en(a)quot/LC_MESSAGES/elfutils.mo +#usr/share/locale/es/LC_MESSAGES/elfutils.mo +#usr/share/locale/ja/LC_MESSAGES/elfutils.mo +#usr/share/locale/pl/LC_MESSAGES/elfutils.mo +#usr/share/locale/uk/LC_MESSAGES/elfutils.mo diff --git a/config/rootfiles/packages/ltrace b/config/rootfiles/packages/ltr= ace new file mode 100644 index 0000000..9964a70 --- /dev/null +++ b/config/rootfiles/packages/ltrace @@ -0,0 +1,10 @@ +etc/ltrace.conf +usr/bin/ltrace +#usr/share/doc/ltrace +#usr/share/doc/ltrace/COPYING +#usr/share/doc/ltrace/CREDITS +#usr/share/doc/ltrace/INSTALL +#usr/share/doc/ltrace/README +#usr/share/doc/ltrace/TODO +#usr/share/man/man1/ltrace.1 +#usr/share/man/man5/ltrace.conf.5 diff --git a/lfs/dbus b/lfs/dbus index fdbad47..a1e68f2 100644 --- a/lfs/dbus +++ b/lfs/dbus @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 1.0.3 +VER =3D 1.11.12 =20 THISAPP =3D dbus-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D dbus -PAK_VER =3D 1 +PAK_VER =3D 2 =20 DEPS =3D "" =20 @@ -44,7 +44,8 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D ce328423db5743fe9006d39113b5324d +$(DL_FILE)_MD5 =3D 76cdf92ca208652ee487b1e9dfda1093 + install : $(TARGET) =20 check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -77,7 +78,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_SRC)/dbus* cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dbus-1.0.3-compile-fix= -1.patch cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \ --localstatedir=3D/var cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/elfutils b/lfs/elfutils new file mode 100644 index 0000000..69c0083 --- /dev/null +++ b/lfs/elfutils @@ -0,0 +1,84 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2013 IPFire Team = # +# = # +# 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 . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.168 + +THISAPP =3D elfutils-$(VER) +DL_FILE =3D $(THISAPP).tar.bz2 +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D elfutils +PAK_VER =3D 1 + +DEPS =3D "" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D 52adfa40758d0d39e5d5c57689bf38d6 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/ltrace b/lfs/ltrace new file mode 100644 index 0000000..21b43d3 --- /dev/null +++ b/lfs/ltrace @@ -0,0 +1,85 @@ +############################################################################= ### +# = # +# IPFire.org - A linux based firewall = # +# Copyright (C) 2013 IPFire Team = # +# = # +# 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 . = # +# = # +############################################################################= ### + +############################################################################= ### +# Definitions +############################################################################= ### + +include Config + +VER =3D 0.7.3 + +THISAPP =3D ltrace-$(VER) +DL_FILE =3D ltrace_$(VER).orig.tar.bz2 +DL_FROM =3D $(URL_IPFIRE) +DIR_APP =3D $(DIR_SRC)/$(THISAPP) +TARGET =3D $(DIR_INFO)/$(THISAPP) +PROG =3D ltrace +PAK_VER =3D 1 + +DEPS =3D "elfutils" + +############################################################################= ### +# Top-level Rules +############################################################################= ### + +objects =3D $(DL_FILE) + +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 =3D b3dd199af8f18637f7d4ef97fdfb9d14 + +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 axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc \ + --disable-werror + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 183ee7d..b2a94ce 100755 --- a/make.sh +++ b/make.sh @@ -842,6 +842,8 @@ buildipfire() { ipfiremake sendEmail ipfiremake sysbench ipfiremake strace + ipfiremake elfutils + ipfiremake ltrace ipfiremake ipfire-netboot ipfiremake lcdproc ipfiremake bitstream diff --git a/src/paks/dbus/install.sh b/src/paks/dbus/install.sh index 8b5c749..bf4e5a6 100644 --- a/src/paks/dbus/install.sh +++ b/src/paks/dbus/install.sh @@ -24,4 +24,10 @@ . /opt/pakfire/lib/functions.sh extract_files useradd messagebus -start_service ${NAME} + +# Create start links +ln -svf ../init.d/messagebus /etc/rc.d/rc3.d/S15messagebus +ln -svf ../init.d/messagebus /etc/rc.d/rc0.d/K85messagebus +ln -svf ../init.d/messagebus /etc/rc.d/rc6.d/K85messagebus + +start_service messagebus diff --git a/src/paks/dbus/uninstall.sh b/src/paks/dbus/uninstall.sh index f5b8042..49fc30e 100644 --- a/src/paks/dbus/uninstall.sh +++ b/src/paks/dbus/uninstall.sh @@ -23,4 +23,8 @@ # . /opt/pakfire/lib/functions.sh stop_service ${NAME} + +# Remove start files +rm -rf /etc/rc.d/rc*.d/*messagebus + remove_files diff --git a/src/patches/dbus-1.0.3-compile-fix-1.patch b/src/patches/dbus-1.= 0.3-compile-fix-1.patch deleted file mode 100644 index 86fd2b3..0000000 --- a/src/patches/dbus-1.0.3-compile-fix-1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 03:50:33.000000000 += 0200 -+++ dbus-1.0.1.orig/dbus/dbus-sysdeps-unix.c 2009-01-01 04:09:24.000000000 += 0200 -@@ -992,7 +992,7 @@=20 - _dbus_verbose ("read credentials byte\n"); -=20 - { --#ifdef SO_PEERCRED -+#if defined(SO_PEERCRED) && defined(HAVE_GETPEERUCRED) - struct ucred cr; =20 - int cr_len =3D sizeof (cr); - =20 hooks/post-receive -- IPFire 2.x development tree --===============5219772946637817738==--