Up to 6.1

[packages/bftpd.git] / bftpd-NOROOT.patch

diff --git a/bftpd-NOROOT.patch b/bftpd-NOROOT.patch
index eb4ade15ced8416cd69e33359e182e792549c0ec..8f3282dacf18125c444abd3b470940927c69c66f 100644 (file)
--- a/bftpd-NOROOT.patch
+++ b/bftpd-NOROOT.patch
@@ -1,21 +1,23 @@
-diff -urNp -x '*.orig' bftpd.org/Makefile.in bftpd/Makefile.in
---- bftpd.org/Makefile.in      2009-10-06 23:27:39.000000000 +0200
-+++ bftpd/Makefile.in  2023-02-02 09:01:57.425707183 +0100
-@@ -26,14 +26,10 @@ bftpd: $(OBJS)
- $(OBJS): $(HEADERS) Makefile
+--- bftpd/Makefile.in~ 2022-01-28 19:01:03.000000000 +0100
++++ bftpd/Makefile.in  2023-02-03 06:27:20.969832315 +0100
+@@ -38,17 +38,12 @@ endif
  
  install: all
+       mkdir -p $(DESTDIR)/$(prefix)/sbin
 -      $(INSTALL) -g 0 -m 700 -o 0 bftpd $(DESTDIR)/$(prefix)/sbin
++      $(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
+       mkdir -p $(DESTDIR)/$(mandir)/man8
 -      $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
-+      $(INSTALL) bftpd $(DESTDIR)/$(prefix)/sbin
-+      $(INSTALL) bftpd.8 $(DESTDIR)/$(mandir)/man8
-       [ -f $(DESTDIR)/etc/bftpd.conf ] || \
--              $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
--      touch /var/log/bftpd.log
--      chmod 644 /var/log/bftpd.log
--      mkdir -p /var/run/bftpd
--      chmod 755 /var/run/bftpd
-+              $(INSTALL) bftpd.conf $(DESTDIR)/etc
++      $(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
+       mkdir -p $(DESTDIR)/$(prefix)/etc
+       [ -f $(DESTDIR)/$(prefix)/etc/bftpd.conf ] || \
+-              $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/$(prefix)/etc
+-      mkdir -p $(DESTDIR)/$(prefix)/var/log
+-      touch $(DESTDIR)/$(prefix)/var/log/bftpd.log
+-      chmod 644 $(DESTDIR)/$(prefix)/var/log/bftpd.log
+-      mkdir -p $(DESTDIR)/$(prefix)/var/run/bftpd
+-      chmod 755 $(DESTDIR)/$(prefix)/var/run/bftpd
++              $(INSTALL) -m 600 bftpd.conf $(DESTDIR)/etc
  
  clean distclean:
        rm -f *~ $(OBJS) bftpd mksources.finished config.cache