Hello community, here is the log from the commit of package dnsmasq for openSUSE:Factory checked in at 2015-01-07 09:38:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dnsmasq (Old) and /work/SRC/openSUSE:Factory/.dnsmasq.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dnsmasq" Changes: -------- --- /work/SRC/openSUSE:Factory/dnsmasq/dnsmasq.changes 2014-12-31 11:22:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dnsmasq.new/dnsmasq.changes 2015-01-07 09:38:24.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 6 09:58:25 UTC 2015 - jsl...@suse.com + +- The change from Wed Dec 24 messed group w/ user IDs. Switch them + back and be more careful w/ what is changed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dnsmasq.spec ++++++ --- /var/tmp/diff_new_pack.7HwCrw/_old 2015-01-07 09:38:24.000000000 +0100 +++ /var/tmp/diff_new_pack.7HwCrw/_new 2015-01-07 09:38:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dnsmasq # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,16 +69,19 @@ dos2unix contrib/systemd/dbus_activation # SED-FIX-UPSTREAM -- Fix paths -sed -i -e 's|/usr/local|/usr|' \ - -i -e 's|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' Makefile +sed -i -e 's|\(PREFIX *= *\)/usr/local|\1/usr|; + s|$(LDFLAGS)|$(CFLAGS) $(LDFLAGS)|' \ + Makefile # SED-FIX-UPSTREAM -- Fix man page -sed -i 's|world readable.|world readable. The defaults are to "nogroup"|' man/dnsmasq.8 +sed -i -e 's|The defaults to "dip",|The default is "nogroup",|' \ + man/dnsmasq.8 # SED-FIX-UPSTREAM -- Fix cachesize, group and user -sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|' \ - -i -e 's|nobody|nogroup|' \ - -i -e 's|dip|dnsmasq|' src/config.h +sed -i -e 's|CACHESIZ 150|CACHESIZ 2000|; + s|CHUSER "nobody"|CHUSER "dnsmasq"|; + s|CHGRP "dip"|CHGRP "nogroup"|' \ + src/config.h %build echo "#define HAVE_DBUS" >> src/config.h -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
