Hello community, here is the log from the commit of package dante for openSUSE:Factory checked in at 2015-02-22 17:26:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dante (Old) and /work/SRC/openSUSE:Factory/.dante.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dante" Changes: -------- --- /work/SRC/openSUSE:Factory/dante/dante.changes 2014-06-01 18:57:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dante.new/dante.changes 2015-02-22 17:26:05.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Jan 30 14:35:48 UTC 2015 - [email protected] + +- reviewed the systemd init script +- added patch: + * dante-1.4.0-sockd_conf.patch to accomplish new syntax + +------------------------------------------------------------------- New: ---- dante-1.4.0-sockd_conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dante.spec ++++++ --- /var/tmp/diff_new_pack.gaqJEk/_old 2015-02-22 17:26:06.000000000 +0100 +++ /var/tmp/diff_new_pack.gaqJEk/_new 2015-02-22 17:26:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dante # -# 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 @@ -40,6 +40,7 @@ Patch3: dante-1.4.0-socksify_man_format.patch Patch4: dante-1.4.0-glibc-2.17.patch Patch5: dante-1.4.0-sendbuf_macro.patch +Patch6: dante-1.4.0-sockd_conf.patch # SuSE series: sec %description @@ -94,6 +95,7 @@ %patch4 %endif %patch5 -p1 +%patch6 -p1 %build DANTELIBC=`find /%{_lib}/ -maxdepth 1 -iname "libc.so.*"` ++++++ dante-1.4.0-sockd_conf.patch ++++++ --- dante-1.4.0/example/sockd.conf 2012-06-01 21:59:26.000000000 +0200 +++ dante-1.4.1/example/sockd.conf 2015-01-22 13:27:37.325928880 +0100 @@ -1,4 +1,4 @@ -# $Id: sockd.conf,v 1.52 2012/06/01 19:59:26 karls Exp $ +# $Id: sockd.conf,v 1.52.10.2 2014/09/03 14:49:13 michaels Exp $ # # A sample sockd.conf # @@ -13,7 +13,7 @@ # logoutput # internal # external -# method +# socksmethod # clientmethod # users # compatibility @@ -29,7 +29,7 @@ # # block/pass # from to -# method +# socksmethod # command # libwrap # log @@ -52,24 +52,24 @@ # 195.168.1.1 #external: 192.168.1.1 -# list over acceptable methods, order of preference. -# A method not set here will never be selected. +# list over acceptable authentication methods, order of preference. +# An authentication method not set here will never be selected. # -# If the method field is not set in a rule, the global -# method is filled in for that rule. +# If the socksmethod field is not set in a rule, the global +# socksmethod is filled in for that rule. # # methods for socks-rules. -#method: username none #rfc931 +#socksmethod: username none #rfc931 # methods for client-rules. #clientmethod: none #or if you want to allow rfc931 (ident) too -#method: username rfc931 none +#socksmethod: username rfc931 none #or for PAM authentication -#method: pam +#socksmethod: pam # # User identities, an important section. @@ -82,6 +82,8 @@ # when running as usual, it will use the unprivileged userid of "sockd". #user.unprivileged: sockd +# If you are not using libwrap, no need for the below line, so leave +# it commented. # If you compiled with libwrap support, what userid should it use # when executing your libwrap commands? "libwrap". #user.libwrap: libwrap @@ -98,9 +100,8 @@ # This will usually require user.privileged to be set to "root". #compatibility: sameport -# If you are using the bind extension and have trouble running servers -# via the server, you might try setting this. The consequences of it -# are unknown. +# If you are using the Inferno Nettverk bind extension and have trouble +# running servers via the server, you might try setting this. #compatibility: reuseaddr # @@ -162,7 +163,7 @@ # Allow our clients, also provides an example of the port range command. #client pass { # from: 10.0.0.0/8 port 1-65535 to: 0.0.0.0/0 -# method: rfc931 # match all idented users that also are in passwordfile +# clientmethod: rfc931 # match all idented users that also are in passwordfile #} # This is identical to above, but allows clients without a rfc931 (ident) @@ -187,7 +188,7 @@ # you probably don't want people connecting to loopback addresses, # who knows what could happen then. -#block { +#socks block { # from: 0.0.0.0/0 to: lo0 # log: connect error #} @@ -195,14 +196,14 @@ # the people at the 172.16.0.0/12 are bad, no one should talk to them. # log the connect request and also provide an example on how to # interact with libwrap. -#block { +#socks block { # from: 0.0.0.0/0 to: 172.16.0.0/12 # libwrap: spawn finger @%a # log: connect error #} # unless you need it, you could block any bind requests. -#block { +#socks block { # from: 0.0.0.0/0 to: 0.0.0.0/0 # command: bind # log: connect error @@ -213,7 +214,7 @@ # should usually by from "0.0.0.0/0", i.e if a client of yours # has permission to bind, it will also have permission to accept # the reply from anywhere. -#pass { +#socks pass { # from: 10.0.0.0/8 to: 0.0.0.0/0 # command: bind # log: connect error @@ -225,7 +226,7 @@ # Note that nothing is done to verify that it's a "genuine" reply, # that is in general not possible anyway. The below will allow # all "replies" in to your clients at the 10.0.0.0/8 net. -#pass { +#socks pass { # from: 0.0.0.0/0 to: 10.0.0.0/8 # command: bindreply udpreply # log: connect error @@ -235,29 +236,29 @@ # pass any http connects to the example.com domain if they # authenticate with username. # This matches "example.com" itself and everything ending in ".example.com". -#pass { +#socks pass { # from: 10.0.0.0/8 to: .example.com port = http # log: connect error -# method: username +# clientmethod: username #} # block any other http connects to the example.com domain. -#block { +#socks block { # from: 0.0.0.0/0 to: .example.com port = http # log: connect error #} # everyone from our internal network, 10.0.0.0/8 is allowed to use # tcp and udp for everything else. -#pass { +#socks pass { # from: 10.0.0.0/8 to: 0.0.0.0/0 # protocol: tcp udp #} # last line, block everyone else. This is the default but if you provide # one yourself you can specify your own logging/actions -#block { +#socks block { # from: 0.0.0.0/0 to: 0.0.0.0/0 # log: connect error #} ++++++ sockd.service ++++++ --- /var/tmp/diff_new_pack.gaqJEk/_old 2015-02-22 17:26:06.000000000 +0100 +++ /var/tmp/diff_new_pack.gaqJEk/_new 2015-02-22 17:26:06.000000000 +0100 @@ -4,9 +4,9 @@ [Service] Type=forking -EnvironmentFile=/etc/sockd.conf +#EnvironmentFile=/etc/sockd.conf PIDFile=/run/sockd.pid -ExecStart=/usr/sbin/sockd $SOCKD_OPTS +ExecStart=/usr/sbin/sockd -D $SOCKD_OPTS [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
