pavlix pushed to dnsmasq (f22). "Resolves: #1239256 - install
trust-anchors.conf"
by notifications＠fedoraproject.org
From e6ea56c2ab40085198391b172ce188b7b763a3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda(a)redhat.com>
Date: Fri, 2 Oct 2015 16:24:49 +0200
Subject: Resolves: #1239256 - install trust-anchors.conf
---
dnsmasq.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 876d817..9be7a47 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.75
-Release: 1%{?extraversion:.%{extraversion}}%{?dist}
+Release: 2%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -61,6 +61,8 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
done
+sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+
#enable dbus
sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
@@ -95,6 +97,7 @@ install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -D trust-anchors.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/trust-anchors.conf
# utils sub package
mkdir -p $RPM_BUILD_ROOT%{_bindir} \
@@ -131,12 +134,16 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/%{name}.service
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
+%{_datadir}/%{name}/trust-anchors.conf
%files utils
%{_bindir}/dhcp_*
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Oct 02 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-2
+- Resolves: #1239256 - install trust-anchors.conf
+
* Wed Aug 05 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-1
- new version 2.75
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f22&id=e6ea56c2a...
8 years, 8 months
pavlix pushed to dnsmasq (f21). "Resolves: #1239256 - install
trust-anchors.conf"
by notifications＠fedoraproject.org
From e6ea56c2ab40085198391b172ce188b7b763a3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda(a)redhat.com>
Date: Fri, 2 Oct 2015 16:24:49 +0200
Subject: Resolves: #1239256 - install trust-anchors.conf
---
dnsmasq.spec | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 876d817..9be7a47 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.75
-Release: 1%{?extraversion:.%{extraversion}}%{?dist}
+Release: 2%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -61,6 +61,8 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
done
+sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+
#enable dbus
sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
@@ -95,6 +97,7 @@ install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -D trust-anchors.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/trust-anchors.conf
# utils sub package
mkdir -p $RPM_BUILD_ROOT%{_bindir} \
@@ -131,12 +134,16 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/%{name}.service
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
+%{_datadir}/%{name}/trust-anchors.conf
%files utils
%{_bindir}/dhcp_*
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Oct 02 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-2
+- Resolves: #1239256 - install trust-anchors.conf
+
* Wed Aug 05 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-1
- new version 2.75
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=f21&id=e6ea56c2a...
8 years, 8 months
[dnsmasq] Don't use SO_REUSEPORT on DHCPv4 socket to prevent conflicts with ISC DHCP (#981973)
by Tomas Hozza
commit ea5468d6a1b65e37fd3de348c05b26bbcc2d33c5
Author: Tomas Hozza <thozza(a)redhat.com>
Date: Mon Aug 12 15:12:18 2013 +0200
Don't use SO_REUSEPORT on DHCPv4 socket to prevent conflicts with ISC DHCP (#981973)
Signed-off-by: Tomas Hozza <thozza(a)redhat.com>
....66-Dont_use_SO_REUSEPORT_on_dhcp4_socket.patch | 17 +++++++++++++++++
dnsmasq.spec | 10 +++++++++-
2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/dnsmasq-2.66-Dont_use_SO_REUSEPORT_on_dhcp4_socket.patch b/dnsmasq-2.66-Dont_use_SO_REUSEPORT_on_dhcp4_socket.patch
new file mode 100644
index 0000000..6ad4dfc
--- /dev/null
+++ b/dnsmasq-2.66-Dont_use_SO_REUSEPORT_on_dhcp4_socket.patch
@@ -0,0 +1,17 @@
+diff -up dnsmasq-2.66/src/dhcp.c.reuseport dnsmasq-2.66/src/dhcp.c
+--- dnsmasq-2.66/src/dhcp.c.reuseport 2013-08-12 14:35:07.575237403 +0200
++++ dnsmasq-2.66/src/dhcp.c 2013-08-12 14:35:48.220273629 +0200
+@@ -72,11 +72,13 @@ static int make_fd(int port)
+ {
+ int rc = -1, porterr = 0;
+
++/*
+ #ifdef SO_REUSEPORT
+ if ((rc = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &oneopt, sizeof(oneopt))) == -1 &&
+ errno != ENOPROTOOPT)
+ porterr = 1;
+ #endif
++*/
+
+ if (rc == -1 && !porterr)
+ rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &oneopt, sizeof(oneopt));
diff --git a/dnsmasq.spec b/dnsmasq.spec
index c9aeef2..ec7b0b2 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.67
-Release: 0.4.%{?extraversion}%{?dist}
+Release: 0.5.%{?extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -22,6 +22,9 @@ URL: http://www.thekelleys.org.uk/dnsmasq/
Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
Source1: %{name}.service
+# Don't use SO_REUSEPORT on DHCPv4 socket to prevent conflicts with ISC DHCP
+Patch0: %{name}-2.66-Dont_use_SO_REUSEPORT_on_dhcp4_socket.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel
@@ -56,6 +59,8 @@ query/remove a DHCP server's leases.
%prep
%setup -q -n %{name}-%{version}%{?extraversion}
+%patch0 -p1 -b .reuseport
+
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -135,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/dhcp_*
%changelog
+* Mon Aug 12 2013 Tomas Hozza <thozza(a)redhat.com> - 2.67-0.5.test7
+- Don't use SO_REUSEPORT on DHCPv4 socket to prevent conflicts with ISC DHCP (#981973)
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.67-0.4.test7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
10 years, 10 months
pemensik pushed to dnsmasq (master). "Emit warning with dnssec
enabled on FIPS system (#1549507) (..more)"
by notifications＠fedoraproject.org
From 144c414c6792bdddbdb92529a4186ebb27afb28f Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Mar 02 2018 12:18:01 +0000
Subject: Emit warning with dnssec enabled on FIPS system (#1549507)
Signed-off-by: Petr Menšík <pemensik(a)redhat.com>
---
diff --git a/dnsmasq-2.78-fips.patch b/dnsmasq-2.78-fips.patch
new file mode 100644
index 0000000..a341796
--- /dev/null
+++ b/dnsmasq-2.78-fips.patch
@@ -0,0 +1,47 @@
+From c7d5a6a968fa2bd7412c913adf274aaa7174303a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com>
+Date: Fri, 2 Mar 2018 13:17:04 +0100
+Subject: [PATCH] Print warning on FIPS machine with dnssec enabled. Dnsmasq
+ has no proper FIPS 140-2 compliant implementation.
+
+---
+ src/dnsmasq.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/dnsmasq.c b/src/dnsmasq.c
+index 771bec1..1cb69b7 100644
+--- a/src/dnsmasq.c
++++ b/src/dnsmasq.c
+@@ -182,6 +182,7 @@ int main (int argc, char **argv)
+
+ if (daemon->cachesize < CACHESIZ)
+ die(_("cannot reduce cache size from default when DNSSEC enabled"), NULL, EC_BADCONF);
++
+ #else
+ die(_("DNSSEC not available: set HAVE_DNSSEC in src/config.h"), NULL, EC_BADCONF);
+ #endif
+@@ -741,6 +742,7 @@ int main (int argc, char **argv)
+ if (option_bool(OPT_DNSSEC_VALID))
+ {
+ int rc;
++ int fips;
+
+ /* Delay creating the timestamp file until here, after we've changed user, so that
+ it has the correct owner to allow updating the mtime later.
+@@ -752,6 +754,13 @@ int main (int argc, char **argv)
+ }
+
+ my_syslog(LOG_INFO, _("DNSSEC validation enabled"));
++
++ fips = open("/etc/system-fips", O_RDONLY);
++ if (fips != -1)
++ {
++ close(fips);
++ my_syslog(LOG_WARNING, _("DNSSEC support is not FIPS 140-2 compliant"));
++ }
+
+ daemon->dnssec_no_time_check = option_bool(OPT_DNSSEC_TIME);
+ if (option_bool(OPT_DNSSEC_TIME) && !daemon->back_to_the_future)
+--
+2.14.3
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index cb4fca5..b135676 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.78
-Release: 6%{?extraversion:.%{extraversion}}%{?dist}
+Release: 7%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
License: GPLv2 or GPLv3
@@ -25,6 +25,7 @@ Source2: dnsmasq-systemd-sysusers.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1495409
Patch1: dnsmasq-2.77-underflow.patch
Patch2: dnsmasq-2.78-CVE-2017-15107.patch
+Patch3: dnsmasq-2.78-fips.patch
BuildRequires: dbus-devel
@@ -58,6 +59,7 @@ server's leases.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch1 -p1 -b .underflow
%patch2 -p1 -b .CVE-2017-15107
+%patch3 -p1 -b .fips
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -157,6 +159,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/dnsmasq.conf
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Mar 02 2018 Petr Menšík <pemensik(a)redhat.com> - 2.78-7
+- Emit warning with dnssec enabled on FIPS system (#1549507)
+
* Sun Feb 25 2018 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 2.78-6
- Create user before installing files (#1548050)
https://src.fedoraproject.org/rpms/dnsmasq/c/144c414c6792bdddbdb92529a418...
6 years, 3 months
pemensik pushed to dnsmasq (f28). "Emit warning with dnssec enabled
on FIPS system (#1549507) (..more)"
by notifications＠fedoraproject.org
From 144c414c6792bdddbdb92529a4186ebb27afb28f Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Mar 02 2018 12:18:01 +0000
Subject: Emit warning with dnssec enabled on FIPS system (#1549507)
Signed-off-by: Petr Menšík <pemensik(a)redhat.com>
---
diff --git a/dnsmasq-2.78-fips.patch b/dnsmasq-2.78-fips.patch
new file mode 100644
index 0000000..a341796
--- /dev/null
+++ b/dnsmasq-2.78-fips.patch
@@ -0,0 +1,47 @@
+From c7d5a6a968fa2bd7412c913adf274aaa7174303a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com>
+Date: Fri, 2 Mar 2018 13:17:04 +0100
+Subject: [PATCH] Print warning on FIPS machine with dnssec enabled. Dnsmasq
+ has no proper FIPS 140-2 compliant implementation.
+
+---
+ src/dnsmasq.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/dnsmasq.c b/src/dnsmasq.c
+index 771bec1..1cb69b7 100644
+--- a/src/dnsmasq.c
++++ b/src/dnsmasq.c
+@@ -182,6 +182,7 @@ int main (int argc, char **argv)
+
+ if (daemon->cachesize < CACHESIZ)
+ die(_("cannot reduce cache size from default when DNSSEC enabled"), NULL, EC_BADCONF);
++
+ #else
+ die(_("DNSSEC not available: set HAVE_DNSSEC in src/config.h"), NULL, EC_BADCONF);
+ #endif
+@@ -741,6 +742,7 @@ int main (int argc, char **argv)
+ if (option_bool(OPT_DNSSEC_VALID))
+ {
+ int rc;
++ int fips;
+
+ /* Delay creating the timestamp file until here, after we've changed user, so that
+ it has the correct owner to allow updating the mtime later.
+@@ -752,6 +754,13 @@ int main (int argc, char **argv)
+ }
+
+ my_syslog(LOG_INFO, _("DNSSEC validation enabled"));
++
++ fips = open("/etc/system-fips", O_RDONLY);
++ if (fips != -1)
++ {
++ close(fips);
++ my_syslog(LOG_WARNING, _("DNSSEC support is not FIPS 140-2 compliant"));
++ }
+
+ daemon->dnssec_no_time_check = option_bool(OPT_DNSSEC_TIME);
+ if (option_bool(OPT_DNSSEC_TIME) && !daemon->back_to_the_future)
+--
+2.14.3
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index cb4fca5..b135676 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.78
-Release: 6%{?extraversion:.%{extraversion}}%{?dist}
+Release: 7%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
License: GPLv2 or GPLv3
@@ -25,6 +25,7 @@ Source2: dnsmasq-systemd-sysusers.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1495409
Patch1: dnsmasq-2.77-underflow.patch
Patch2: dnsmasq-2.78-CVE-2017-15107.patch
+Patch3: dnsmasq-2.78-fips.patch
BuildRequires: dbus-devel
@@ -58,6 +59,7 @@ server's leases.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch1 -p1 -b .underflow
%patch2 -p1 -b .CVE-2017-15107
+%patch3 -p1 -b .fips
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -157,6 +159,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/dnsmasq.conf
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Mar 02 2018 Petr Menšík <pemensik(a)redhat.com> - 2.78-7
+- Emit warning with dnssec enabled on FIPS system (#1549507)
+
* Sun Feb 25 2018 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 2.78-6
- Create user before installing files (#1548050)
https://src.fedoraproject.org/rpms/dnsmasq/c/144c414c6792bdddbdb92529a418...
6 years, 3 months
pemensik pushed to dnsmasq (f27). "Emit warning with dnssec enabled
on FIPS system (#1549507) (..more)"
by notifications＠fedoraproject.org
From 144c414c6792bdddbdb92529a4186ebb27afb28f Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik(a)redhat.com>
Date: Mar 02 2018 12:18:01 +0000
Subject: Emit warning with dnssec enabled on FIPS system (#1549507)
Signed-off-by: Petr Menšík <pemensik(a)redhat.com>
---
diff --git a/dnsmasq-2.78-fips.patch b/dnsmasq-2.78-fips.patch
new file mode 100644
index 0000000..a341796
--- /dev/null
+++ b/dnsmasq-2.78-fips.patch
@@ -0,0 +1,47 @@
+From c7d5a6a968fa2bd7412c913adf274aaa7174303a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik(a)redhat.com>
+Date: Fri, 2 Mar 2018 13:17:04 +0100
+Subject: [PATCH] Print warning on FIPS machine with dnssec enabled. Dnsmasq
+ has no proper FIPS 140-2 compliant implementation.
+
+---
+ src/dnsmasq.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/dnsmasq.c b/src/dnsmasq.c
+index 771bec1..1cb69b7 100644
+--- a/src/dnsmasq.c
++++ b/src/dnsmasq.c
+@@ -182,6 +182,7 @@ int main (int argc, char **argv)
+
+ if (daemon->cachesize < CACHESIZ)
+ die(_("cannot reduce cache size from default when DNSSEC enabled"), NULL, EC_BADCONF);
++
+ #else
+ die(_("DNSSEC not available: set HAVE_DNSSEC in src/config.h"), NULL, EC_BADCONF);
+ #endif
+@@ -741,6 +742,7 @@ int main (int argc, char **argv)
+ if (option_bool(OPT_DNSSEC_VALID))
+ {
+ int rc;
++ int fips;
+
+ /* Delay creating the timestamp file until here, after we've changed user, so that
+ it has the correct owner to allow updating the mtime later.
+@@ -752,6 +754,13 @@ int main (int argc, char **argv)
+ }
+
+ my_syslog(LOG_INFO, _("DNSSEC validation enabled"));
++
++ fips = open("/etc/system-fips", O_RDONLY);
++ if (fips != -1)
++ {
++ close(fips);
++ my_syslog(LOG_WARNING, _("DNSSEC support is not FIPS 140-2 compliant"));
++ }
+
+ daemon->dnssec_no_time_check = option_bool(OPT_DNSSEC_TIME);
+ if (option_bool(OPT_DNSSEC_TIME) && !daemon->back_to_the_future)
+--
+2.14.3
+
diff --git a/dnsmasq.spec b/dnsmasq.spec
index cb4fca5..b135676 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.78
-Release: 6%{?extraversion:.%{extraversion}}%{?dist}
+Release: 7%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
License: GPLv2 or GPLv3
@@ -25,6 +25,7 @@ Source2: dnsmasq-systemd-sysusers.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1495409
Patch1: dnsmasq-2.77-underflow.patch
Patch2: dnsmasq-2.78-CVE-2017-15107.patch
+Patch3: dnsmasq-2.78-fips.patch
BuildRequires: dbus-devel
@@ -58,6 +59,7 @@ server's leases.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch1 -p1 -b .underflow
%patch2 -p1 -b .CVE-2017-15107
+%patch3 -p1 -b .fips
# use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
@@ -157,6 +159,9 @@ install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysusersdir}/dnsmasq.conf
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Mar 02 2018 Petr Menšík <pemensik(a)redhat.com> - 2.78-7
+- Emit warning with dnssec enabled on FIPS system (#1549507)
+
* Sun Feb 25 2018 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 2.78-6
- Create user before installing files (#1548050)
https://src.fedoraproject.org/rpms/dnsmasq/c/144c414c6792bdddbdb92529a418...
6 years, 3 months
rpms/dnsmasq/devel .cvsignore, 1.12, 1.13 dnsmasq.spec, 1.21, 1.22 sources, 1.12, 1.13
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/pkgs/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21041
Modified Files:
.cvsignore dnsmasq.spec sources
Log Message:
* Tue Sep 18 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.40-1
- Finalized upstream release
- Removing URLs from patch lines (CVS is the authoritative source)
- Added more magic to make spinning rc/test packages more seamless
(thanks to Kevin Fenzi for inspiring the latter two ;-)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 27 Aug 2007 21:40:07 -0000 1.12
+++ .cvsignore 18 Sep 2007 15:15:26 -0000 1.13
@@ -1 +1 @@
-dnsmasq-2.40rc2.tar.gz
+dnsmasq-2.40.tar.gz
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- dnsmasq.spec 27 Aug 2007 21:40:07 -0000 1.21
+++ dnsmasq.spec 18 Sep 2007 15:15:26 -0000 1.22
@@ -1,17 +1,20 @@
-%define extraversion rc2
+#%define extrapath release-candidates/
+#%define extrapath test-releases/
+#%define extraversion rc2
+#%define extraversion test2
Name: dnsmasq
Version: 2.40
-Release: 0.1.%{extraversion}%{?dist}
+Release: 1%{extraversion}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
License: GPLv2
URL: http://www.thekelleys.org.uk/dnsmasq/
-Source0: http://www.thekelleys.org.uk/dnsmasq/%{name}-%{version}%{?extraversion}.t...
-Patch0: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-initscript.patch
-Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.33-enable-dbus.patch
-Patch2: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-2.35-conf-dir.patch
+Source0: http://www.thekelleys.org.uk/dnsmasq/%{?extrapath}%{name}-%{version}%{?ex...
+Patch0: %{name}-2.33-initscript.patch
+Patch1: %{name}-2.33-enable-dbus.patch
+Patch2: %{name}-2.35-conf-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" > "3" || "%aurora" > "2"
@@ -94,6 +97,11 @@
%changelog
+* Tue Sep 18 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.40-1
+- Finalized upstream release
+- Removing URLs from patch lines (CVS is the authoritative source)
+- Added more magic to make spinning rc/test packages more seamless
+
* Sun Aug 26 2007 Patrick "Jima" Laughton <jima(a)beer.tclug.org> 2.40-0.1.rc2
- New upstream release candidate (feature-frozen), thanks Simon!
- License clarification
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dnsmasq/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 27 Aug 2007 21:40:07 -0000 1.12
+++ sources 18 Sep 2007 15:15:26 -0000 1.13
@@ -1 +1 @@
-45b3ca53556e99b1edaef2142fb0e306 dnsmasq-2.40rc2.tar.gz
+91b6063ae81146b9d70b4381b2f3e44f dnsmasq-2.40.tar.gz
16 years, 9 months
Re: dnsmasq configuration
by Simon Slater
On Sat, 2009-03-28 at 11:54 +1100, Simon Slater wrote:
> G'day all,
> I've a qustion about the dhcp server configuration in dnsmasq. The
> way I've configured it it is listening on eth1 as it ought, but is
> offering on eth0 which it oughtn't. What have I missed in the
> configuration?
>
> # Configuration file for dnsmasq.
> #
> interface=eth1
> except-interface=eth0
> dhcp-range=192.168.1.100,192.168.1.199,255.255.255.0,10m
> dhcp-option=28,192.168.1.255
> log-queries
> log-dhcp
> [simon@dell ~]$
> and /var/log/messages:
> Mar 28 11:45:33 dell dnsmasq[12161]: DHCP packet: transaction-id is
> 1613319306
> Mar 28 11:45:33 dell dnsmasq[12161]: Available DHCP range: 192.168.1.100
> --
> 192.168.1.199
> Mar 28 11:45:33 dell dnsmasq[12161]: DHCPDISCOVER(eth1) 192.168.1.103
> 00:10:5a:62:2a:a5
> Mar 28 11:45:33 dell dnsmasq[12161]: DHCPOFFER(eth1) 192.168.1.103
> 00:10:5a:62:2a:a5
> Mar 28 11:45:33 dell dnsmasq[12161]: requested options: 1:netmask,
> 28:broadcast, 2:time-offset,
> 3:router,
> Mar 28 11:45:33 dell dnsmasq[12161]: requested options: 15:domain-name,
> 6:dns-server,
> 12:hostname,
> Mar 28 11:45:33 dell dnsmasq[12161]: requested options: 40:nis-domain,
> 41:nis-server,
> 42:ntp-server
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 1 option:
> 53:message-type 02
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option:
> 54:server-identifier
> c0:a8:01:01
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 51:lease-time
> 00:00:02:58
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 58:T1
> 00:00:01:2c
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 59:T2
> 00:00:02:0d
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 1:netmask
> ff:ff:ff:00
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 3:router
> c0:a8:01:01
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 6:dns-server
> c0:a8:01:01
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 11 option:
> 15:domain-name
> 6c:6f:63:61:6c:64:6f:6d:61:69:6e
> Mar 28 11:45:33 dell dnsmasq[12161]: sent size: 4 option: 28:broadcast
> c0:a8:01:ff
> Mar 28 11:45:33 dell kernel: [IPTABLES DROP] : IN= OUT=eth0
> SRC=192.168.1.9 DST=192.168.1.103 LEN=333 TOS=0x00 PREC=0x00 TTL=64
> ID=19755 PROTO=UDP SPT=67 DPT=68 LEN=313
>
> How do I configure dnsmasq to offer dhcp on eth1?
>
> Thanks in advance.
>
I've been slowly plugging away at this and may have found something
useful. After a reboot I got the message:
dnsmasq failed to bind DHCP server socket: address already in use.
In the startup sequence as it scrolls on the screen, dnsmasq is near the
end, but is running:
[root@dell ~]# service dnsmasq status
dnsmasq (pid 2613) is running...
So is the problem with the configuration or at startup? How do I find
what is conflicting for the socket address?
--
Regards,
Simon Slater
Registered Linux User #463789. Be counted at: http://counter.li.org/
15 years, 2 months
rpms/dnsmasq/FC-3 dnsmasq.spec,1.9,1.10
by fedora-extras-commits＠redhat.com
Author: jima
Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5037/FC-3
Modified Files:
dnsmasq.spec
Log Message:
Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dnsmasq.spec 8 May 2006 17:05:40 -0000 1.9
+++ dnsmasq.spec 15 May 2006 16:14:15 -0000 1.10
@@ -1,6 +1,6 @@
Name: dnsmasq
Version: 2.31
-Release: 1%{?dist}
+Release: 1%{?dist}.1
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -11,7 +11,7 @@
Patch1: http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-enable-dbu...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
BuildRequires: dbus-devel
%endif
@@ -34,7 +34,7 @@
%prep
%setup -q
%patch0 -p1
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
%patch1 -p1
%endif
@@ -51,7 +51,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
%endif
install rpm/dnsmasq.init $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
@@ -79,7 +79,7 @@
%defattr(-,root,root,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0 dbus/DBus-interface
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dnsmasq.conf
-%if "%{dist}" != ".fc3"
+%if "%fedora" > "3" || "%aurora" > "2"
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/dbus-1/system.d/dnsmasq.conf
%endif
%{_initrddir}/dnsmasq
@@ -88,6 +88,9 @@
%changelog
+* Mon May 15 2006 Patrick "Jima" Laughton <jima(a)fedoraproject.org> 2.31-1.fc3.1
+- Patch from Dennis Gilmore fixed the conditionals to detect Aurora Linux
+
* Mon May 8 2006 Patrick "Jima" Laughton <jima(a)auroralinux.org> 2.31-1
- Removed dbus config patch (now provided upstream)
- Patched in init script (no longer provided upstream)
18 years, 1 month
pavlix pushed to dnsmasq (master). "Resolves: #1239256 - install
trust-anchors.conf"
by notifications＠fedoraproject.org
From e6ea56c2ab40085198391b172ce188b7b763a3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda(a)redhat.com>
Date: Fri, 2 Oct 2015 16:24:49 +0200
Subject: Resolves: #1239256 - install trust-anchors.conf
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 876d817..9be7a47 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -13,7 +13,7 @@
Name: dnsmasq
Version: 2.75
-Release: 1%{?extraversion:.%{extraversion}}%{?dist}
+Release: 2%{?extraversion:.%{extraversion}}%{?dist}
Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons
@@ -61,6 +61,8 @@ for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
done
+sed -i "s:%%PREFIX%%:${EPREFIX}/usr:" dnsmasq.conf.example
+
#enable dbus
sed -i 's|/\* #define HAVE_DBUS \*/|#define HAVE_DBUS|g' src/config.h
@@ -95,6 +97,7 @@ install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install dbus/dnsmasq.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/
install -m 644 man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+install -D trust-anchors.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/trust-anchors.conf
# utils sub package
mkdir -p $RPM_BUILD_ROOT%{_bindir} \
@@ -131,12 +134,16 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/%{name}.service
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*
+%{_datadir}/%{name}/trust-anchors.conf
%files utils
%{_bindir}/dhcp_*
%{_mandir}/man1/dhcp_*
%changelog
+* Fri Oct 02 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-2
+- Resolves: #1239256 - install trust-anchors.conf
+
* Wed Aug 05 2015 Pavel Šimerda <psimerda(a)redhat.com> - 2.75-1
- new version 2.75
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/dnsmasq.git/commit/?h=master&id=e6ea56...
8 years, 8 months