New patch for /usr/sbin and CFLAGS. Update .service file

5 files changed, 34 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25a1a420854e..f3f67aa779c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Dec 26 18:16:30 UTC 2015
+# Sat Aug 20 17:14:29 UTC 2016
 pkgbase = llmnrd-git
 	pkgdesc = Link-Local Multicast Resolution Daemon
-	pkgver = r49.86a6f90
-	pkgrel = 3
+	pkgver = r70.f46d59e
+	pkgrel = 1
 	url = https://github.com/tklauser/llmnrd
 	arch = i686
 	arch = x86_64
@@ -11,11 +11,11 @@ pkgbase = llmnrd-git
 	makedepends = git
 	makedepends = patch
 	source = llmnrd::git+https://github.com/tklauser/llmnrd.git
-	source = llmnrd-destdir.patch
+	source = llmnrd-sbin.patch
 	source = llmnrd.service
 	md5sums = SKIP
-	md5sums = 366476ae16ff195746ed588375fc62f8
-	md5sums = 3214030732bb26594fcad0858e9f5e2b
+	md5sums = f4bb6314ec0f7d8b521b3d07b6935765
+	md5sums = 160407f11d69704b3b05b2e1a3ae2e26
 
 pkgname = llmnrd-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f69b81fb528..55c6be9f3d4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Nazar Mishturak <nazarmx@gmail.com>
 pkgname=llmnrd-git
-pkgver=r49.86a6f90
-pkgrel=3
+pkgver=r70.f46d59e
+pkgrel=1
 pkgdesc="Link-Local Multicast Resolution Daemon"
 arch=('i686' 'x86_64')
 url="https://github.com/tklauser/llmnrd"
 license=('GPL2')
 makedepends=('git' 'patch')
 source=("${pkgname%-git}::git+https://github.com/tklauser/llmnrd.git"
-        'llmnrd-destdir.patch'
+        'llmnrd-sbin.patch'
         'llmnrd.service')
 md5sums=('SKIP'
-         '366476ae16ff195746ed588375fc62f8'
-         '3214030732bb26594fcad0858e9f5e2b')
+         'f4bb6314ec0f7d8b521b3d07b6935765'
+         '160407f11d69704b3b05b2e1a3ae2e26')
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
@@ -21,7 +21,7 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/${pkgname%-git}"
-  patch -p1 -i "$srcdir/llmnrd-destdir.patch"
+  patch -p1 -i "$srcdir/llmnrd-sbin.patch"
 }
 
 build() {
@@ -31,6 +31,6 @@ build() {
 
 package() {
   cd "$srcdir/${pkgname%-git}"
-  make CFLAGS="$CFLAGS" DESTDIR="$pkgdir" prefix="/usr" install
+  make DESTDIR="$pkgdir" prefix="/usr" install
   install -D -m0644 "$srcdir/llmnrd.service" "$pkgdir/usr/lib/systemd/system/llmnrd.service"
 }
diff --git a/llmnrd-destdir.patch b/llmnrd-destdir.patch
deleted file mode 100644
index 83882382e845..000000000000
--- a/llmnrd-destdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- llmnrd/Makefile.orig	2015-12-26 19:39:45.632362533 +0200
-+++ llmnrd/Makefile	2015-12-26 19:42:19.714861130 +0200
-@@ -39,8 +39,7 @@
- prefix	?= /usr/local
- 
- BINDIR	= $(prefix)/bin
--SBINDIR	= $(prefix)/sbin
--DESTDIR	=
-+SBINDIR	= $(prefix)/bin
- 
- all: $(D_P) $(Q_P)
- 
-@@ -59,12 +58,12 @@
- install_$(D_P): $(D_P)
- 	@echo "  INSTALL $(D_P)"
- 	@$(INSTALL) -d -m 755 $(DESTDIR)$(SBINDIR)
--	@$(INSTALL) -m 755 $(D_P) $(SBINDIR)/$(D_P)
-+	@$(INSTALL) -m 755 $(D_P) $(DESTDIR)$(SBINDIR)/$(D_P)
- 
- install_$(Q_P): $(Q_P)
- 	@echo "  INSTALL $(Q_P)"
- 	@$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)
--	@$(INSTALL) -m 755 $(Q_P) $(BINDIR)/$(Q_P)
-+	@$(INSTALL) -m 755 $(Q_P) $(DESTDIR)$(BINDIR)/$(Q_P)
- 
- install: install_$(D_P) install_$(Q_P)
- 
diff --git a/llmnrd-sbin.patch b/llmnrd-sbin.patch
new file mode 100644
index 000000000000..51df5bce5cb5
--- /dev/null
+++ b/llmnrd-sbin.patch
@@ -0,0 +1,20 @@
+--- llmnrd/Makefile.orig	2016-08-20 20:08:10.162847600 +0300
++++ llmnrd/Makefile	2016-08-20 20:08:43.298449900 +0300
+@@ -17,7 +17,7 @@
+ CC	= $(CROSS_COMPILE)gcc
+ INSTALL	= install
+ 
+-CFLAGS	?= -W -Wall -O2
++CFLAGS	?= $(CFLAGS)
+ LDFLAGS	?=
+ 
+ ifeq ($(shell git rev-parse > /dev/null 2>&1; echo $$?), 0)
+@@ -39,7 +39,7 @@
+ prefix	?= /usr/local
+ 
+ BINDIR	= $(prefix)/bin
+-SBINDIR	= $(prefix)/sbin
++SBINDIR	= $(prefix)/bin
+ DESTDIR	=
+ 
+ all: $(D_P) $(Q_P)
diff --git a/llmnrd.service b/llmnrd.service
index d27c9f477cd8..b294cabfbc2a 100644
--- a/llmnrd.service
+++ b/llmnrd.service
@@ -6,8 +6,7 @@ After=network.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/llmnrd -6
-Restart=always
-RestartSec=0
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target