Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / dnsmasq
Commits: 9687650b by Christian Hesse at 2026-05-18T11:22:59+02:00 update handling of pkgver - - - - - ddab1f7f by Christian Hesse at 2026-05-18T11:31:49+02:00 upgpkg: 2.92.rel2-2: fix build flags This makes sure the debug symbols are available, but more important: With this change the binary is built with our flags as intended - it was lacking FULL RELRO before... Closes: https://gitlab.archlinux.org/archlinux/packaging/packages/dnsmasq/-/work_items/2 - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = dnsmasq pkgdesc = Lightweight, easy to configure DNS forwarder and DHCP server pkgver = 2.92.rel2 - pkgrel = 1 + pkgrel = 2 url = http://www.thekelleys.org.uk/dnsmasq/doc.html arch = x86_64 license = GPL-2.0-or-later ===================================== PKGBUILD ===================================== @@ -5,7 +5,8 @@ pkgname=dnsmasq pkgver=2.92.rel2 -pkgrel=1 +_pkgver=${pkgver/.rel/rel} +pkgrel=2 pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server' url='http://www.thekelleys.org.uk/dnsmasq/doc.html' arch=('x86_64') @@ -14,7 +15,7 @@ depends=('glibc' 'gmp' 'libidn2' 'libidn2.so' 'libdbus' 'libdbus-1.so' 'nftables 'libnetfilter_conntrack' 'nettle' 'libnettle.so' 'libhogweed.so') backup=('etc/dnsmasq.conf') validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <[email protected]> -source=("http://www.thekelleys.org.uk/${pkgname}/${pkgname}-${pkgver/.rel/rel}.tar.xz"{,.asc} +source=("http://www.thekelleys.org.uk/${pkgname}/${pkgname}-${_pkgver}.tar.xz"{,.asc} '0001-nettle-4-0.patch' 'dnsmasq.service' 'dnsmasq.sysusers') @@ -27,13 +28,13 @@ sha256sums=('43d72b8c129bdf33d17bafedc98823f63e46b5005128066bf0d2a472a32ce06a' _build_copts='-DHAVE_CONNTRACK -DHAVE_DBUS -DHAVE_DNSSEC -DHAVE_LIBIDN2 -DHAVE_NFTSET' prepare() { - cd "${pkgname}-${pkgver/.rel/rel}" + cd "${pkgname}-${_pkgver}" patch -Np1 < ../0001-nettle-4-0.patch } build() { - cd "${pkgname}-${pkgver/.rel/rel}" + cd "${pkgname}-${_pkgver}" make \ CFLAGS="${CPPFLAGS} ${CFLAGS}" \ @@ -53,10 +54,12 @@ build() { } package() { - cd "${pkgname}-${pkgver/.rel/rel}" + cd "${pkgname}-${_pkgver}" - # need to pass COPTS here to avoid rebuilding the binary. + # need to pass CFLAGS, LDFLAGS & COPTS here to avoid rebuilding the binary make \ + CFLAGS="${CPPFLAGS} ${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ COPTS="${_build_copts}" \ PREFIX=/usr \ BINDIR=/usr/bin \ @@ -75,5 +78,3 @@ package() { install -Dm0755 -t "${pkgdir}"/usr/bin/ 'contrib/lease-tools/dhcp_'{release{,6},lease_time} install -Dm0644 -t "${pkgdir}"/usr/share/man/man1 'contrib/lease-tools/dhcp_'{release{,6},lease_time}.1 } - -# vim: ts=2 sw=2 et ft=sh View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dnsmasq/-/compare/12b6b9af6b51cb6da2a57b082ac5d1c740a24036...ddab1f7f7873083795a36e6e362340bbf8fe20d6 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/dnsmasq/-/compare/12b6b9af6b51cb6da2a57b082ac5d1c740a24036...ddab1f7f7873083795a36e6e362340bbf8fe20d6 You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
