Sophie

Sophie

distrib > Mageia > 7 > i586 > media > core-updates-src > by-pkgid > 66cf70cb4b27fe034994d790dba13f43 > files > 11

proftpd-1.3.5e-4.2.mga7.src.rpm

diff -Naur proftpd-1.3.4a/contrib/Makefile.in proftpd-1.3.4a.oden/contrib/Makefile.in
--- proftpd-1.3.4a/contrib/Makefile.in	2011-03-16 17:22:48.000000000 -0400
+++ proftpd-1.3.4a.oden/contrib/Makefile.in	2011-12-06 07:36:54.726496175 -0500
@@ -18,6 +18,6 @@
 	cd ../ && ./config.status
 
 install-utils:
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
+	$(INSTALL) -m 0755 ftpasswd $(DESTDIR)$(bindir)/ftpasswd
+	$(INSTALL) -m 0755 ftpmail $(DESTDIR)$(bindir)/ftpmail
+	$(INSTALL) -m 0755 ftpquota $(DESTDIR)$(bindir)/ftpquota
diff -Naur proftpd-1.3.5/contrib/mod_sftp/Makefile.in proftpd-1.3.5.oden/contrib/mod_sftp/Makefile.in
--- proftpd-1.3.5/contrib/mod_sftp/Makefile.in	2011-10-13 12:23:36.000000000 -0400
+++ proftpd-1.3.5.oden/contrib/mod_sftp/Makefile.in	2011-12-06 07:34:07.938501834 -0500
@@ -46,8 +46,8 @@
 	fi
 
 install-misc:
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem 
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
+	$(INSTALL) -m 0644 dhparams.pem $(DESTDIR)$(sysconfdir)/dhparams.pem 
+	$(INSTALL) -m 0644 blacklist.dat $(DESTDIR)$(sysconfdir)/blacklist.dat
 
 clean:
 	$(LIBTOOL) --mode=clean $(RM) $(MODULE_NAME).a $(MODULE_NAME).la *.o *.lo .libs/*.o
diff -Naur proftpd-1.3.4a/locale/Makefile.in proftpd-1.3.4a.oden/locale/Makefile.in
--- proftpd-1.3.4a/locale/Makefile.in	2010-05-04 16:48:02.000000000 -0400
+++ proftpd-1.3.4a.oden/locale/Makefile.in	2011-12-06 07:37:07.454495353 -0500
@@ -51,7 +51,6 @@
 		if [ -f $$lang.mo ]; then \
  			if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \
 				mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
-				chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 				chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 			fi; \
 			$(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
diff -Naur proftpd-1.3.4a/Makefile.in proftpd-1.3.4a.oden/Makefile.in
--- proftpd-1.3.4a/Makefile.in	2011-11-06 16:37:09.000000000 -0500
+++ proftpd-1.3.4a.oden/Makefile.in	2011-12-06 07:34:07.937501782 -0500
@@ -80,7 +80,6 @@
 $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
 	@if [ ! -d $@ ]; then \
 		mkdir -p $@; \
-		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
 		chmod 0755 $@; \
 	fi
 
@@ -90,7 +89,6 @@
 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
 	fi
 	ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
-	-chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
 
 install-libs: $(DESTDIR)$(libdir)/proftpd
 	cd lib/ && $(MAKE) install
@@ -127,11 +125,11 @@
 	$(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
 	$(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
 	$(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
-	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
+	$(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
 
 install-conf: $(DESTDIR)$(sysconfdir)
 	if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
-		$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
+		$(INSTALL) -m 0644 \
 		           $(top_srcdir)/sample-configurations/basic.conf \
 	       	           $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
 	fi
diff -Naur proftpd-1.3.4a/Make.rules.in proftpd-1.3.4a.oden/Make.rules.in
--- proftpd-1.3.5/Make.rules.in	2011-11-06 16:37:09.000000000 -0500
+++ proftpd-1.3.5.oden/Make.rules.in	2011-12-06 07:34:07.937501784 -0500
@@ -26,11 +26,9 @@
 
 INSTALL=@INSTALL@
 INSTALL_STRIP=@INSTALL_STRIP@
-INSTALL_USER=@install_user@
-INSTALL_GROUP=@install_group@
-INSTALL_BIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_SBIN=$(INSTALL) $(INSTALL_STRIP) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
-INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
+INSTALL_BIN=$(INSTALL) -m 0755
+INSTALL_SBIN=$(INSTALL) -m 0755
+INSTALL_MAN=$(INSTALL) -m 0644
 
 RM=rm -f
 SHELL=@CONFIG_SHELL@