From: Jan Rękorajski Date: Sat, 9 Sep 2000 18:04:23 +0000 (+0000) Subject: - fix parameter passing to emirror X-Git-Tag: emirror-2_1_17-2~1 X-Git-Url: http://git.pld-linux.org/?p=packages%2Femirror.git;a=commitdiff_plain;h=f9cb0ce368b9ef2a15dd2875b3f14b6fc13904e5 - fix parameter passing to emirror - fix paths in manpage - DESTDIR in Makefile - clean up general.cfg Changed files: emirror-pld.patch -> 1.1 --- diff --git a/emirror-pld.patch b/emirror-pld.patch new file mode 100644 index 0000000..133ea15 --- /dev/null +++ b/emirror-pld.patch @@ -0,0 +1,144 @@ +diff -urN emirror-2.1.17/bin/mirror.in emirror-2.1.17.pld/bin/mirror.in +--- emirror-2.1.17/bin/mirror.in Tue Aug 15 14:21:40 2000 ++++ emirror-2.1.17.pld/bin/mirror.in Sat Sep 9 19:46:17 2000 +@@ -17,4 +17,4 @@ + + # Start the mirror program and update the index page + +-emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -n @OUTPUTDIRECTORY@ ++emirror -- -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ +diff -urN emirror-2.1.17/bin/updateindex.in emirror-2.1.17.pld/bin/updateindex.in +--- emirror-2.1.17/bin/updateindex.in Tue Aug 15 14:21:20 2000 ++++ emirror-2.1.17.pld/bin/updateindex.in Sat Sep 9 19:46:34 2000 +@@ -10,4 +10,4 @@ + + # Start the mirror program and update the index page + +-emirror -v -c @sysconfdir@/emirror/general.cfg -n @OUTPUTDIRECTORY@ ++emirror -- -v -c @sysconfdir@/emirror/general.cfg +diff -urN emirror-2.1.17/etc/general.cfg.in emirror-2.1.17.pld/etc/general.cfg.in +--- emirror-2.1.17/etc/general.cfg.in Sun Aug 20 17:28:41 2000 ++++ emirror-2.1.17.pld/etc/general.cfg.in Sat Sep 9 19:45:00 2000 +@@ -1,18 +1,21 @@ + [general] ++Download-url: ftp://localhost/pub/mirrors ++Parent: /home/ftp/pub/mirrors + Parent-Format: None + Output-directory: @HTMLDIR@ + Output-format: HTML + Tries: 5 + Wait: 30 +-Email: root@localhost ++Email: ftp@localhost + Max-parallel: 3 + Recursive: Yes ++Follow-Symlinks: Yes + Username: anonymous +-Password: anonymous@localhost +-Error-MailCmd: mail -s "EMirror Error Report" Martin.Preishuber@eclipt.uni-klu.ac.at ++Password: emirror@localhost ++Error-MailCmd: mail -s "EMirror Error Report" ftp@localhost + Mail-Users: @SYSCONFDIR@/emirror/email-addresses + Mail-User-Cmd: mail -s "EMirror EMail-Information" + Log-Template: @SYSCONFDIR@/emirror/logfile.template + Index-Template: @SYSCONFDIR@/emirror/index.template + Index-Directory: @HTMLDIR@ +-Summary-Template: @SYSCONFDIR/emirror/summary.template +\ No newline at end of file ++Summary-Template: @SYSCONFDIR@/emirror/summary.template +diff -urN emirror-2.1.17/man/emirror.1 emirror-2.1.17.pld/man/emirror.1 +--- emirror-2.1.17/man/emirror.1 Sun Aug 20 17:31:36 2000 ++++ emirror-2.1.17.pld/man/emirror.1 Sat Sep 9 19:40:24 2000 +@@ -117,7 +117,7 @@ + .IP "--mail-users" + Specifies a file, which contains a list of valid email-addresses + of users, who want to get information about updates +-(e.g. /usr/local/etc/email-addresses) ++(e.g. /etc/emirror/email-addresses) + .IP "--info-mailcmd" + Command to send mail to users when one spcific mirror has been updated + (e.g. mail -s "EMirror - Package updated: %s" user1@host1 user2@host2) +@@ -461,11 +461,11 @@ + .IR EMIRRORCFGPATH + + .SH FILES +-\fI/usr/local/lib/emirror/*\fP, +-\fI/usr/local/etc/general.cfg\fP, +-\fI/usr/local/etc/email-addresses\fP, +-\fI/usr/local/etc/active/*\fP, +-\fI/usr/local/etc/unused/*\fP ++\fI/usr/lib/emirror/*\fP, ++\fI/etc/emirror/general.cfg\fP, ++\fI/etc/emirror/email-addresses\fP, ++\fI/etc/emirror/active/*\fP, ++\fI/etc/emirror/unused/*\fP + + .SH UNRESTRICTIONS + .PP +--- emirror-2.1.17/Makefile.in~ Tue Aug 15 13:59:15 2000 ++++ emirror-2.1.17/Makefile.in Sat Sep 9 19:51:04 2000 +@@ -5,38 +5,38 @@ + PYTHON=@PYTHON@ + libdir=$(prefix)/lib/emirror +-etcdir=$(sysconfdir)/emirror +-mandir=$(prefix)/man/man1 ++etcdir=@sysconfdir@/emirror ++mandir=@mandir@/man1 + + all: + @echo There\'s no need to compile anything - use \"make install\" + + install : +- @echo Installing files in $(prefix) ... +- @$(INSTALL) -d $(bindir) +- @$(INSTALL) emirror $(bindir) +- @$(INSTALL) emirrortest $(bindir) +- @$(INSTALL) -d $(libdir) +- @$(INSTALL) -m 644 main.py $(libdir) +- @$(INSTALL) -m 644 constants.py $(libdir) +- @$(INSTALL) -m 644 error.py $(libdir) +- @$(INSTALL) -m 644 tools.py $(libdir) +- @$(INSTALL) -m 644 ftplibbeta.py $(libdir) +- @echo Copying example configuration files to $(etcdir) ... +- @$(INSTALL) -d $(etcdir) +- @$(INSTALL) -m 644 etc/*.cfg $(etcdir) +- @$(INSTALL) -m 644 etc/email-addresses $(etcdir) +- @$(INSTALL) -m 644 etc/*.template $(etcdir) +- @$(INSTALL) -m 644 etc/*.gif $(etcdir) +- @$(INSTALL) -d $(etcdir)/active +- @$(INSTALL) -d $(etcdir)/unused +- @$(INSTALL) -m 644 etc/unused/*.cfg $(etcdir)/unused +- @$(INSTALL) -m 755 bin/mirror $(bindir) +- @$(INSTALL) -m 755 bin/updateindex $(bindir) ++ @echo Installing files in $(DESTDIR)$(prefix) ... ++ @$(INSTALL) -d $(DESTDIR)$(bindir) ++ @$(INSTALL) emirror $(DESTDIR)$(bindir) ++ @$(INSTALL) emirrortest $(DESTDIR)$(bindir) ++ @$(INSTALL) -d $(DESTDIR)$(libdir) ++ @$(INSTALL) -m 644 main.py $(DESTDIR)$(libdir) ++ @$(INSTALL) -m 644 constants.py $(DESTDIR)$(libdir) ++ @$(INSTALL) -m 644 error.py $(DESTDIR)$(libdir) ++ @$(INSTALL) -m 644 tools.py $(DESTDIR)$(libdir) ++ @$(INSTALL) -m 644 ftplibbeta.py $(DESTDIR)$(libdir) ++ @echo Copying example configuration files to $(DESTDIR)$(etcdir) ... ++ @$(INSTALL) -d $(DESTDIR)$(etcdir) ++ @$(INSTALL) -m 644 etc/*.cfg $(DESTDIR)$(etcdir) ++ @$(INSTALL) -m 644 etc/email-addresses $(DESTDIR)$(etcdir) ++ @$(INSTALL) -m 644 etc/*.template $(DESTDIR)$(etcdir) ++ @$(INSTALL) -m 644 etc/*.gif $(DESTDIR)$(etcdir) ++ @$(INSTALL) -d $(DESTDIR)$(etcdir)/active ++ @$(INSTALL) -d $(DESTDIR)$(etcdir)/unused ++ @$(INSTALL) -m 644 etc/unused/*.cfg $(DESTDIR)$(etcdir)/unused ++ @$(INSTALL) -m 755 bin/mirror $(DESTDIR)$(bindir) ++ @$(INSTALL) -m 755 bin/updateindex $(DESTDIR)$(bindir) + @echo Installing manpage +- @$(INSTALL) -d $(mandir) +- @$(INSTALL) -m 644 man/emirror.1 $(mandir) ++ @$(INSTALL) -d $(DESTDIR)$(mandir) ++ @$(INSTALL) -m 644 man/emirror.1 $(DESTDIR)$(mandir) + @echo Compiling python modules ... +- @(PYTHONPATH=$(libdir); export PYTHONPATH; $(bindir)/emirror > /dev/null 2>&1) ++ @(PYTHONPATH=$(DESTDIR)$(libdir); export PYTHONPATH; $(DESTDIR)$(bindir)/emirror > /dev/null 2>&1) + @echo Don\'t forget to set some environment variables: + @echo + @echo PATH should contain $(bindir)