cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 07:28:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

avahi: update to 0.8

Browse Source 
Clean up Makefile slightly.

Update configure options for the new version.

Remove first patch and update the other one.

Use a different solution for the stack protector on certain platforms.

Run script through shellcheck. Small quote fix.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev
2020-02-25 19:31:34 -08:00
parent bfc6828ef2
commit 9290d41077
4 changed files with 18 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/avahi/patches/010-step_back_autotools-no-gettext.patch
-88
View File
@@ -1,88 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index 8234d69..156d4c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,8 +75,7 @@ SUBDIRS = \
avahi-compat-howl \
avahi-autoipd \
avahi-ui \
- avahi-ui-sharp \
- po
+ avahi-ui-sharp
DX_INPUT = \
$(srcdir)/avahi-common/address.h \
diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
index 5fc4b25..4c39d3d 100644
--- a/avahi-python/avahi-discover/Makefile.am
+++ b/avahi-python/avahi-discover/Makefile.am
@@ -38,7 +38,6 @@ if HAVE_GDBM
pythonscripts += \
avahi-discover
desktop_DATA += avahi-discover.desktop
-@INTLTOOL_DESKTOP_RULE@
avahi_discover_PYTHON += __init__.py
endif
@@ -46,7 +45,6 @@ if HAVE_DBM
pythonscripts += \
avahi-discover
desktop_DATA += avahi-discover.desktop
-@INTLTOOL_DESKTOP_RULE@
avahi_discover_PYTHON += __init__.py
endif
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 238d43a..65a147a 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -80,7 +80,6 @@ endif
bin_PROGRAMS = bssh
desktop_DATA += bssh.desktop bvnc.desktop
-@INTLTOOL_DESKTOP_RULE@
bssh_SOURCES = bssh.c
@@ -108,6 +107,4 @@ endif # HAVE_GLIB
endif
endif
-@INTLTOOL_DESKTOP_RULE@
-
CLEANFILES = $(desktop_DATA) $(desktop_DATA_in)
diff --git a/configure.ac b/configure.ac
index 6678971..00dac6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_INIT([avahi],[0.7],[avahi (at) lists (dot) freedesktop (dot) org])
AC_CONFIG_SRCDIR([avahi-core/server.c])
AC_CONFIG_MACRO_DIR([common])
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
+AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax])
AC_SUBST(PACKAGE_URL, [http://avahi.org/])
@@ -43,8 +43,6 @@ AC_SUBST(HOWL_COMPAT_VERSION, [0.9.8])
AC_CANONICAL_HOST
-AM_SILENT_RULES([yes])
-
AC_CHECK_PROG([STOW], [stow], [yes], [no])
AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [
@@ -413,12 +411,6 @@ if test "x$have_kqueue" = "xyes" ; then
AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage])
fi
-IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=avahi
-AC_SUBST([GETTEXT_PACKAGE])
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
-
avahilocaledir='${prefix}/${DATADIRNAME}/locale'
AC_SUBST(avahilocaledir)
libs/avahi/patches/020-revert-runtime-dir-systemd-change.patch
+5 -20
View File
@@ -1,26 +1,11 @@
From ef0ea001f6dd13d6a2e0bc17d13f595d2829f8a8 Mon Sep 17 00:00:00 2001
From: Jeremiah McConnell <miah@miah.com>
Date: Fri, 15 Jun 2018 11:31:10 -0600
Subject: [PATCH] move runtime_dir to /var/run
Upstream transitioned to using /run as runtime_dir for 0.7. Revert
that change for procd compatibility.
Signed-off-by: Jeremiah McConnell <miah@miah.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 72d61478..8f6e9768 100644
--- a/configure.ac
+++ b/configure.ac
@@ -984,7 +984,7 @@ AC_DEFINE_UNQUOTED(AVAHI_AUTOIPD_GROUP,"$AVAHI_AUTOIPD_GROUP", [Group for runnin
--- a/configure
+++ b/configure
@@ -24638,7 +24638,7 @@ _ACEOF
#
# Avahi runtime dir
#
-avahi_runtime_dir="/run"
+avahi_runtime_dir="${localstatedir}/run"
avahi_socket="${avahi_runtime_dir}/avahi-daemon/socket"
AC_SUBST(avahi_runtime_dir)
AC_SUBST(avahi_socket)