File urbackup-server-fhs.patch of Package urbackup-server
diff -Pdpru urbackup-server-2.4.13.orig/Makefile.am urbackup-server-2.4.13/Makefile.am --- urbackup-server-2.4.13.orig/Makefile.am 2020-07-14 19:17:35.000000000 +0200 +++ urbackup-server-2.4.13/Makefile.am 2021-05-18 15:28:15.108220865 +0200 @@ -45,7 +45,7 @@ FORTIFY_ldflags = -Wl,-z,relro endif urbackupsrv_LDADD = $(LIBCURL) $(PTHREAD_LIBS) $(DLOPEN_LIBS) $(FUSE_LIBS) -urbackupsrv_CXXFLAGS = $(PTHREAD_CFLAGS) -DLINUX -DSTATIC_PLUGIN $(WITH_FUSEPLUGIN_CXXFLAGS) -DVARDIR='"$(localstatedir)"' -DBINDIR='"$(bindir)"' -DDATADIR='"$(datadir)"' +urbackupsrv_CXXFLAGS = $(PTHREAD_CFLAGS) -DLINUX -DSTATIC_PLUGIN $(WITH_FUSEPLUGIN_CXXFLAGS) -DVARDIR='"$(localstatedir)/lib"' -DBINDIR='"$(bindir)"' -DDATADIR='"$(datadir)"' urbackupsrv_CPPFLAGS = $(CRYPTOPP_CPPFLAGS) $(LIBCURL_CPPFLAGS) $(FUSE_CFLAGS) $(FORTIFY_FLAGS) -DSQLITE_PREPARE_RETRIES=5 if !WITH_ASSERTIONS urbackupsrv_CPPFLAGS+=-DNDEBUG @@ -155,22 +155,22 @@ else endif endif - mkdir -p "$(DESTDIR)$(localstatedir)/urbackup" + mkdir -p "$(DESTDIR)$(localstatedir)/lib/urbackup" test "x$(DESTDIR)$(sbindir)" = "x$(DESTDIR)$(bindir)" || ! test -e $(DESTDIR)$(sbindir)/urbackupsrv || rm $(DESTDIR)$(sbindir)/urbackupsrv if !PACKAGING if FREEBSD pw groupadd urbackup -q || true - pw useradd urbackup -q -g urbackup -d "$(DESTDIR)$(localstatedir)/urbackup" -m -s /usr/bin/false || true + pw useradd urbackup -q -g urbackup -d "$(DESTDIR)$(localstatedir)/lib/urbackup" -m -s /usr/bin/false || true else - adduser urbackup --system --quiet --group --home "$(DESTDIR)$(localstatedir)/urbackup" || adduser urbackup --system --user-group --home "$(DESTDIR)$(localstatedir)/urbackup" || true + adduser urbackup --system --quiet --group --home "$(DESTDIR)$(localstatedir)/lib/urbackup" || adduser urbackup --system --user-group --home "$(DESTDIR)$(localstatedir)/lib/urbackup" || true endif - chown urbackup:urbackup "$(DESTDIR)$(localstatedir)/urbackup" + chown urbackup:urbackup "$(DESTDIR)$(localstatedir)/lib//urbackup" endif install-data-local: urbackup/status.htm urbackupserver/www/js/*.js urbackupserver/www/js/vs/*.js urbackupserver/www/js/vs/base/worker/* urbackupserver/www/js/vs/basic-languages/src/* urbackupserver/www/js/vs/editor/* urbackupserver/www/*.htm urbackupserver/www/*.ico urbackupserver/www/css/*.css urbackupserver/www/images/*.png urbackupserver/www/images/*.gif urbackupserver/www/fonts/* urbackupserver/urbackup_ecdsa409k1.pub urbackupserver/www/swf/* server-license.txt urbackup/dataplan_db.txt - $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(localstatedir)/urbackup" - chmod +x "$(DESTDIR)$(localstatedir)/urbackup" - $(INSTALL_DATA) $(INSTALL_OPTS) $(srcdir)/urbackup/dataplan_db.txt "$(DESTDIR)$(localstatedir)/urbackup/dataplan_db.txt" + $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(localstatedir)/lib/urbackup" + chmod +x "$(DESTDIR)$(localstatedir)/lib/urbackup" + $(INSTALL_DATA) $(INSTALL_OPTS) $(srcdir)/urbackup/dataplan_db.txt "$(DESTDIR)$(localstatedir)/lib/urbackup/dataplan_db.txt" $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(datadir)/urbackup" chmod +x "$(DESTDIR)$(datadir)/urbackup" $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(datadir)/urbackup/www" diff -Pdpru urbackup-server-2.4.13.orig/Makefile.in urbackup-server-2.4.13/Makefile.in --- urbackup-server-2.4.13.orig/Makefile.in 2020-07-14 19:17:50.000000000 +0200 +++ urbackup-server-2.4.13/Makefile.in 2021-05-18 15:28:36.280630149 +0200 @@ -1012,7 +1012,7 @@ urbackupsrv_LDADD = $(LIBCURL) $(PTHREAD $(FUSE_LIBS) $(am__append_8) $(am__append_10) $(am__append_11) \ $(am__append_13) $(am__append_16) urbackupsrv_CXXFLAGS = $(PTHREAD_CFLAGS) -DLINUX -DSTATIC_PLUGIN \ - $(WITH_FUSEPLUGIN_CXXFLAGS) -DVARDIR='"$(localstatedir)"' \ + $(WITH_FUSEPLUGIN_CXXFLAGS) -DVARDIR='"$(localstatedir)/lib"' \ -DBINDIR='"$(bindir)"' -DDATADIR='"$(datadir)"' \ $(am__append_9) $(am__append_12) $(am__append_14) \ $(am__append_15) $(am__append_17) @@ -6310,17 +6310,17 @@ install-exec-local: defaults_server init @INSTALL_INITD_TRUE@@PACKAGING_FALSE@ $(INSTALL) -m 644 -D "$(srcdir)/logrotate_urbackupsrv" "$(sysconfdir)/logrotate.d/urbackupsrv" @INSTALL_INITD_TRUE@@PACKAGING_FALSE@ if ! test -e "$(sysconfdir)/default/urbackupsrv"; then $(INSTALL) -D "$(srcdir)/defaults_server" "$(sysconfdir)/default/urbackupsrv"; fi - mkdir -p "$(DESTDIR)$(localstatedir)/urbackup" + mkdir -p "$(DESTDIR)$(localstatedir)/lib/urbackup" test "x$(DESTDIR)$(sbindir)" = "x$(DESTDIR)$(bindir)" || ! test -e $(DESTDIR)$(sbindir)/urbackupsrv || rm $(DESTDIR)$(sbindir)/urbackupsrv @FREEBSD_TRUE@@PACKAGING_FALSE@ pw groupadd urbackup -q || true -@FREEBSD_TRUE@@PACKAGING_FALSE@ pw useradd urbackup -q -g urbackup -d "$(DESTDIR)$(localstatedir)/urbackup" -m -s /usr/bin/false || true -@FREEBSD_FALSE@@PACKAGING_FALSE@ adduser urbackup --system --quiet --group --home "$(DESTDIR)$(localstatedir)/urbackup" || adduser urbackup --system --user-group --home "$(DESTDIR)$(localstatedir)/urbackup" || true -@PACKAGING_FALSE@ chown urbackup:urbackup "$(DESTDIR)$(localstatedir)/urbackup" +@FREEBSD_TRUE@@PACKAGING_FALSE@ pw useradd urbackup -q -g urbackup -d "$(DESTDIR)$(localstatedir)/lib/urbackup" -m -s /usr/bin/false || true +@FREEBSD_FALSE@@PACKAGING_FALSE@ adduser urbackup --system --quiet --group --home "$(DESTDIR)$(localstatedir)/lib/urbackup" || adduser urbackup --system --user-group --home "$(DESTDIR)$(localstatedir)/lib/urbackup" || true +@PACKAGING_FALSE@ chown urbackup:urbackup "$(DESTDIR)$(localstatedir)/lib/urbackup" install-data-local: urbackup/status.htm urbackupserver/www/js/*.js urbackupserver/www/js/vs/*.js urbackupserver/www/js/vs/base/worker/* urbackupserver/www/js/vs/basic-languages/src/* urbackupserver/www/js/vs/editor/* urbackupserver/www/*.htm urbackupserver/www/*.ico urbackupserver/www/css/*.css urbackupserver/www/images/*.png urbackupserver/www/images/*.gif urbackupserver/www/fonts/* urbackupserver/urbackup_ecdsa409k1.pub urbackupserver/www/swf/* server-license.txt urbackup/dataplan_db.txt - $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(localstatedir)/urbackup" - chmod +x "$(DESTDIR)$(localstatedir)/urbackup" - $(INSTALL_DATA) $(INSTALL_OPTS) $(srcdir)/urbackup/dataplan_db.txt "$(DESTDIR)$(localstatedir)/urbackup/dataplan_db.txt" + $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(localstatedir)/lib/urbackup" + chmod +x "$(DESTDIR)$(localstatedir)/lib/urbackup" + $(INSTALL_DATA) $(INSTALL_OPTS) $(srcdir)/urbackup/dataplan_db.txt "$(DESTDIR)$(localstatedir)/lib/urbackup/dataplan_db.txt" $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(datadir)/urbackup" chmod +x "$(DESTDIR)$(datadir)/urbackup" $(INSTALL) $(INSTALL_OPTS) -m 744 -d "$(DESTDIR)$(datadir)/urbackup/www"
