Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pdnsd for openSUSE:Factory checked in at 2023-10-12 23:40:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pdnsd (Old) and /work/SRC/openSUSE:Factory/.pdnsd.new.1807 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pdnsd" Thu Oct 12 23:40:50 2023 rev:9 rq:1117098 version:1.2.9a Changes: -------- --- /work/SRC/openSUSE:Factory/pdnsd/pdnsd.changes 2021-10-29 22:35:40.827714919 +0200 +++ /work/SRC/openSUSE:Factory/.pdnsd.new.1807/pdnsd.changes 2023-10-12 23:42:08.584971277 +0200 @@ -1,0 +2,19 @@ +Wed Oct 11 14:34:55 UTC 2023 - Dominique Leuenberger <[email protected]> + +- No longer reference the full URL to the tarball: the website no + longer exists (pdnsd 1.2.9a was released in March 2012). + +------------------------------------------------------------------- +Thu Sep 15 14:54:23 UTC 2022 - [email protected] + +- rework patches to be p0 +- add pdnsd_conf.patch + * mainly just beautification for better readability +- add pdnsd.sysconfig file + * ability to pass ARGS +- service files + * update pdnsd.service + * add pdnsd.service.sle12 +- add user/group pdns + +------------------------------------------------------------------- New: ---- pdnsd.service.sle12 pdnsd.sysconfig pdnsd_conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pdnsd.spec ++++++ --- /var/tmp/diff_new_pack.xsgt1Z/_old 2023-10-12 23:42:09.220994300 +0200 +++ /var/tmp/diff_new_pack.xsgt1Z/_new 2023-10-12 23:42:09.224994444 +0200 @@ -1,7 +1,7 @@ # # spec file for package pdnsd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,18 @@ # +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif +%endif + Name: pdnsd + +%define _cache_dir %{_localstatedir}/cache/%{name} +%define _cache_file %{_cache_dir}/%{name}.cache + Version: 1.2.9a Release: 0 Summary: A caching DNS proxy for small networks or dialin accounts @@ -24,17 +35,25 @@ Group: Productivity/Networking/DNS/Servers URL: http://members.home.nl/p.a.rombouts/pdnsd.html -Source0: http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-%{version}-par.tar.gz -Source1: pdnsd.service +#Source0: http://members.home.nl/p.a.rombouts/%{name}/releases/%{name}-%{version}-par.tar.gz +Source0: %{name}-%{version}-par.tar.gz +Source1: %{name}.sysconfig +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +Source2: %{name}.service.sle12 +%else +Source2: %{name}.service +%endif # PATCH-FIX-OPENSUSE -- fix UDP response packet for large responses being incorrectly truncated -- [email protected] -Patch1: pdnsd-fix-udppacketsize.diff +Patch1: %{name}-fix-udppacketsize.diff # borrowed from debian's 1.2.9a-par-3 release -Patch2: pdnsd-06_reproducible_build.patch +Patch2: %{name}-06_reproducible_build.patch # PATCH-FIX-OPENSUSE -- compile fix with newer glibc(?)/kernel-headers(?) where ordering matters -- [email protected] -Patch3: pdnsd-net_if_h-vs-linux_if_h.patch -Recommends: %{name}-doc -BuildRequires: systemd-rpm-macros +Patch3: %{name}-net_if_h-vs-linux_if_h.patch +# PATCH-FIX-OPENSUSE -- cleanup default config +Patch100: %{name}_conf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: systemd-rpm-macros +Recommends: %{name}-doc %{?systemd_ordering} %description @@ -48,59 +67,66 @@ and the file README.par in %{_docdir}/%{name}-doc. %package doc -Summary: Docs for %{name} +Summary: Docs for pdnsd Group: Productivity/Networking/DNS/Servers -%if 0%{?suse_version} >= 1140 BuildArch: noarch -%endif Requires: %{name} %description doc -This package provides various text files for %{name}. +This package provides various text files for pdnsd %prep %setup -q -%autopatch -p1 +%autopatch -p0 %build -%configure --with-cachedir="%{_localstatedir}/cache/%{name}" \ +%configure \ + --enable-ipv6 \ --enable-specbuild \ + --with-cachedir="%{_cache_dir}" \ + --with-default-id=pdns \ --with-query-method=udptcp \ - --enable-ipv6 \ --with-par-queries=3 make %{?_smp_mflags} %install %make_install -mkdir -p %{buildroot}%{_sysconfdir}/init.d -mkdir -p %{buildroot}/%{_unitdir} -cp -a %{SOURCE1} %{buildroot}/%{_unitdir}/ -cp %{buildroot}%{_sysconfdir}/%{name}.conf.sample %{buildroot}%{_sysconfdir}/%{name}.conf +install -D -m 0644 %{S:1} %{buildroot}%{_fillupdir}/sysconfig.%{name} +cp -a %{buildroot}%{_sysconfdir}/%{name}.conf.sample %{buildroot}%{_sysconfdir}/%{name}.conf +install -D -m 0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.service +sed -i -e "s|@cache_file@|%{_cache_file}|" \ + -e "s/@user@/pdns/" -e "s/@group@/pdns/" %{buildroot}%{_unitdir}/%{name}.service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %pre -getent group pdns >/dev/null || /usr/sbin/groupadd -r pdns -%service_add_pre pdnsd.service - -%post -%service_add_post pdnsd.service +# add group +%{_sbindir}/groupadd -r pdns 2>/dev/null || : +# add user +%{_sbindir}/useradd -c "DNS proxy account" -d %{_cache_dir} -G pdns -g pdns \ + -r -s /sbin/nologin pdns 2>/dev/null || : +%service_add_pre %{name}.service %preun -%service_del_preun pdnsd.service +%service_del_preun %{name}.service + +%post +%service_add_post %{name}.service +%{fillup_only -n pdnsd} %postun -%service_del_postun pdnsd.service +%service_del_postun %{name}.service %files %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/pdnsd.conf -%{_sysconfdir}/pdnsd.conf.sample +%config(noreplace) %attr(0640,root,pdns) %{_sysconfdir}/%{name}.conf +%{_sysconfdir}/%{name}.conf.sample %{_sbindir}/*%{name}* %{_mandir}/man*/%{name}* -%config(noreplace) %attr(-,pdns,pdns) %ghost %{_localstatedir}/cache/%{name}/%{name}.cache -%dir %{_localstatedir}/cache/%{name} -%{_unitdir}/*.service +%dir %attr(0750,pdns,pdns) %{_cache_dir} +%ghost %attr(-,pdns,pdns) %{_cache_file} +%{_unitdir}/%{name}.service +%{_fillupdir}/sysconfig.%{name} %files doc %defattr(-,root,root) ++++++ pdnsd-06_reproducible_build.patch ++++++ --- /var/tmp/diff_new_pack.xsgt1Z/_old 2023-10-12 23:42:09.244995169 +0200 +++ /var/tmp/diff_new_pack.xsgt1Z/_new 2023-10-12 23:42:09.248995313 +0200 @@ -3,9 +3,11 @@ - force UTF-8 locale while converting html to text - use SOURCE_DATE_EPOCH for timestamp in manpage ---- a/doc/txt/doc_makefile -+++ b/doc/txt/doc_makefile -@@ -9,13 +9,13 @@ +Index: doc/txt/doc_makefile +=================================================================== +--- doc/txt/doc_makefile.orig ++++ doc/txt/doc_makefile +@@ -9,13 +9,13 @@ doc: intro.txt manual.txt faq.txt .PHONY: doc clean intro.txt: ../html/index.html @@ -22,9 +24,11 @@ clean: @rm -fv intro.txt manual.txt faq.txt ---- a/doc/html2confman.pl -+++ b/doc/html2confman.pl -@@ -50,7 +50,7 @@ +Index: doc/html2confman.pl +=================================================================== +--- doc/html2confman.pl.orig ++++ doc/html2confman.pl +@@ -50,7 +50,7 @@ print <<ENDOFHEADER; ENDOFHEADER @@ -33,9 +37,11 @@ print <<ENDOFHEADER2; .SH NAME pdnsd.conf \\- The configuration file for pdnsd ---- a/doc/doc_makefile -+++ b/doc/doc_makefile -@@ -27,7 +27,7 @@ +Index: doc/doc_makefile +=================================================================== +--- doc/doc_makefile.orig ++++ doc/doc_makefile +@@ -27,7 +27,7 @@ pdnsd-ctl.8: } pdnsd.conf.5.in: html/doc.html html2confman.pl ++++++ pdnsd-fix-udppacketsize.diff ++++++ --- /var/tmp/diff_new_pack.xsgt1Z/_old 2023-10-12 23:42:09.260995748 +0200 +++ /var/tmp/diff_new_pack.xsgt1Z/_new 2023-10-12 23:42:09.264995893 +0200 @@ -9,10 +9,10 @@ Fix by always checking for space in the packet before actually adding any record, be it regular or additional. -Index: b/src/dns_answer.c +Index: src/dns_answer.c =================================================================== ---- a/src/dns_answer.c -+++ b/src/dns_answer.c +--- src/dns_answer.c.orig ++++ src/dns_answer.c @@ -392,10 +392,12 @@ static int add_rr(dns_msg_t **ans, size_ rdlen=dlen; *sz+=dlen; ++++++ pdnsd-net_if_h-vs-linux_if_h.patch ++++++ --- /var/tmp/diff_new_pack.xsgt1Z/_old 2023-10-12 23:42:09.276996327 +0200 +++ /var/tmp/diff_new_pack.xsgt1Z/_new 2023-10-12 23:42:09.280996472 +0200 @@ -19,10 +19,10 @@ So the fix is to include net/if.h explicitly before the others, to work around the issue and fix the build. -Index: b/src/icmp.c +Index: src/icmp.c =================================================================== ---- a/src/icmp.c -+++ b/src/icmp.c +--- src/icmp.c.orig ++++ src/icmp.c @@ -39,6 +39,7 @@ #include <string.h> #include "ipvers.h" ++++++ pdnsd.service ++++++ --- /var/tmp/diff_new_pack.xsgt1Z/_old 2023-10-12 23:42:09.300997196 +0200 +++ /var/tmp/diff_new_pack.xsgt1Z/_new 2023-10-12 23:42:09.304997341 +0200 @@ -1,5 +1,5 @@ [Unit] -Description=Caching DNS proxy +Description=Caching DNS proxy (pdns) Documentation=man:pdnsd(8) After=network.target @@ -18,7 +18,9 @@ RestrictRealtime=true # end of automatic additions Type=simple -ExecStart=/usr/sbin/pdnsd +EnvironmentFile=/etc/sysconfig/pdnsd +ExecStartPre=/usr/bin/install -m0644 -o @user@ -g @group@ /dev/null @cache_file@ +ExecStart=/usr/sbin/pdnsd $PDNSD_ARGS [Install] WantedBy=multi-user.target ++++++ pdnsd.service.sle12 ++++++ [Unit] Description=Caching DNS proxy (pdns) Documentation=man:pdnsd(8) After=network.target [Service] Type=simple EnvironmentFile=/etc/sysconfig/pdnsd ExecStartPre=/usr/bin/install -m0644 -o @user@ -g @group@ /dev/null @cache_file@ ExecStart=/usr/sbin/pdnsd $PDNSD_ARGS [Install] WantedBy=multi-user.target ++++++ pdnsd.sysconfig ++++++ ## Path: Network/DNS/Name Server ## Description: Names server settings ## Type: string ## Default: "-mtu" ## ServiceRestart: pdnsd # # Additional arguments when starting the pdns daemon # # -mxx sets the query method pdnsd uses. Possible values for xx are: # # uo - pdnsd will use UDP only. This is the fastest method, and should # be supported by all name servers on the Internet. # # to - pdnsd will use TCP only. TCP queries usually take more time than # UDP queries, but are more secure against certain attacks, where # an attacker tries to guess your query id and to send forged # answers. TCP queries are not supported by some name servers. # # tu - pdnsd will try to use TCP, and will fall back to UDP if its # connection is refused or times out. # # ut - pdnsd will try to use UDP, and will repeat the query using TCP # if the UDP reply was truncated (i.e. the tc bit is set). # This is the behaviour recommended by the DNS standards. # # the default of "-mtu" causes pdnsd to do tcp first, then udp. # PDNSD_ARGS="-mtu" ++++++ pdnsd_conf.patch ++++++ Index: doc/pdnsd.conf.in =================================================================== --- doc/pdnsd.conf.in.orig +++ doc/pdnsd.conf.in @@ -5,12 +5,12 @@ global { perm_cache=1024; - cache_dir="@cachedir@"; -# pid_file = /var/run/pdnsd.pid; + cache_dir=@cachedir@; +# pid_file=/var/run/pdnsd.pid; run_as="@def_id@"; - server_ip = 127.0.0.1; # Use eth0 here if you want to allow other - # machines on your network to query pdnsd. - status_ctl = on; + server_ip=127.0.0.1; # Use eth0 here if you want to allow other + # machines on your network to query pdnsd. + status_ctl=on; # paranoid=on; # This option reduces the chance of cache poisoning # but may make pdnsd less efficient, unfortunately. query_method=udp_tcp; @@ -24,22 +24,22 @@ global { # The following section is most appropriate if you have a fixed connection to # the Internet and an ISP which provides good DNS servers. server { - label= "myisp"; - ip = 192.168.0.1; # Put your ISP's DNS-server address(es) here. + label="myisp"; + ip=192.168.0.1; # Put your ISP's DNS-server address(es) here. # proxy_only=on; # Do not query any name servers beside your ISP's. # This may be necessary if you are behind some # kind of firewall and cannot receive replies # from outside name servers. timeout=4; # Server timeout; this may be much shorter - # that the global timeout option. + # that the global timeout option. uptest=if; # Test if the network interface is active. interface=eth0; # The name of the interface to check. interval=10m; # Check every 10 minutes. purge_cache=off; # Keep stale cache entries in case the ISP's - # DNS servers go offline. + # DNS servers go offline. edns_query=yes; # Use EDNS for outgoing queries to allow UDP messages - # larger than 512 bytes. May cause trouble with some - # legacy systems. + # larger than 512 bytes. May cause trouble with some + # legacy systems. # exclude=.thepiratebay.org, # If your ISP censors certain names, you may # .thepiratebay.se, # want to exclude them here, and provide an # .piratebay.org, # alternative server section below that will @@ -50,12 +50,12 @@ server { # The following section is more appropriate for dial-up connections. # Read about how to use pdnsd-ctl for dynamic configuration in the documentation. server { - label= "dialup"; - file = "/etc/ppp/resolv.conf"; # Preferably do not use /etc/resolv.conf + label="dialup"; + file="/etc/ppp/resolv.conf"; # Preferably do not use /etc/resolv.conf proxy_only=on; timeout=4; uptest=if; - interface = ppp0; + interface=ppp0; interval=10; # Check the interface every 10 seconds. purge_cache=off; preset=off; @@ -69,44 +69,44 @@ server { # of the search engines of google, microsoft and yahoo. # If you do not like this behaviour the "reject" option may be useful. server { - label = "opendns"; - ip = 208.67.222.222, 208.67.220.220; - reject = 208.69.32.0/24, # You may need to add additional address ranges - 208.69.34.0/24, # here if the addresses of their search engines - 208.67.219.0/24; # change. - reject_policy = fail; # If you do not provide any alternative server + label="opendns"; + ip=208.67.222.222,208.67.220.220; + reject=208.69.32.0/24, # You may need to add additional address ranges + 208.69.34.0/24, # here if the addresses of their search engines + 208.67.219.0/24; # change. + reject_policy=fail; # If you do not provide any alternative server # sections, like the following root-server # example, "negate" may be more appropriate here. - timeout = 4; - uptest = ping; # Test availability using ICMP echo requests. - ping_timeout = 100; # ping test will time out after 10 seconds. - interval = 15m; # Test every 15 minutes. - preset = off; + timeout=4; + uptest=ping; # Test availability using ICMP echo requests. + ping_timeout=100 ; # ping test will time out after 10 seconds. + interval=15m; # Test every 15 minutes. + preset=off; } */ /* # This section is meant for resolving from root servers. server { - label = "root-servers"; - root_server = discover; # Query the name servers listed below - # to obtain a full list of root servers. - randomize_servers = on; # Give every root server an equal chance - # of being queried. - ip = 198.41.0.4, # This list will be expanded to the full - 192.228.79.201; # list on start up. - timeout = 5; - uptest = query; # Test availability using empty DNS queries. -# query_test_name = .; # To be used if remote servers ignore empty queries. - interval = 30m; # Test every half hour. - ping_timeout = 300; # Test should time out after 30 seconds. - purge_cache = off; -# edns_query = yes; # Use EDNS for outgoing queries to allow UDP messages - # larger than 512 bytes. May cause trouble with some - # legacy systems. - exclude = .localdomain; - policy = included; - preset = off; + label="root-servers"; + root_server=discover; # Query the name servers listed below + # to obtain a full list of root servers. + randomize_servers=on; # Give every root server an equal chance + # of being queried. + ip=198.41.0.4, # This list will be expanded to the full + 192.228.79.201; # list on start up. + timeout=5; + uptest=query; # Test availability using empty DNS queries. +# query_test_name=.; # To be used if remote servers ignore empty queries. + interval=30m; # Test every half hour. + ping_timeout=300; # Test should time out after 30 seconds. + purge_cache=off; +# edns_query=yes; # Use EDNS for outgoing queries to allow UDP messages + # larger than 512 bytes. May cause trouble with some + # legacy systems. + exclude=.localdomain; + policy=included; + preset=off; } */ @@ -137,7 +137,7 @@ neg { /* neg { - name=bad.server.com; # Badly behaved server you don't want to connect to. + name=bad.server.com; # Badly behaved server you don't want to connect to. types=A,AAAA; } */
