Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-updates-src > by-pkgid > 539b23dd25451ca8f2f6123f3bb0959b > files > 8

proftpd-1.3.3g-0.1.mga1.src.rpm

diff -Naur proftpd-1.3.3/Makefile.in proftpd-1.3.3.oden/Makefile.in
--- proftpd-1.3.3/Makefile.in	2009-12-16 00:24:42.000000000 +0100
+++ proftpd-1.3.3.oden/Makefile.in	2010-02-25 15:27:32.833312297 +0100
@@ -79,7 +79,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
 
@@ -89,7 +88,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
@@ -125,11 +123,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.3/Make.rules.in proftpd-1.3.3.oden/Make.rules.in
--- proftpd-1.3.3/Make.rules.in	2009-11-18 22:48:25.000000000 +0100
+++ proftpd-1.3.3.oden/Make.rules.in	2010-02-25 15:27:32.833312297 +0100
@@ -26,11 +26,9 @@
 UTILS_LIBS=@UTILS_LIBS@ @LIBS@
 
 INSTALL=@INSTALL@
-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@
diff -Naur proftpd-1.3.3/contrib/mod_sftp/Makefile.in proftpd-1.3.3.oden/contrib/mod_sftp/Makefile.in
--- proftpd-1.3.3/contrib/mod_sftp/Makefile.in	2009-09-16 08:09:57.000000000 +0200
+++ proftpd-1.3.3.oden/contrib/mod_sftp/Makefile.in	2010-02-25 15:27:41.662281837 +0100
@@ -45,8 +45,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:
 	$(RM) $(MODULE_NAME).a *.o *.la *.lo