summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2011-10-29 20:46:21 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-10-29 20:46:21 (GMT)
commit5bc3ba824d7bb548a5ed264a4b1366294f7abd2d (patch) (side-by-side diff)
treef6c10e9696a43b04696fec97821c337c9965ca3d
parentdf4a2a61ce0cde5190def22309e9807cb5a56ab0 (diff)
downloadgsc-5bc3ba824d7bb548a5ed264a4b1366294f7abd2d.tar.gz
gsc-5bc3ba824d7bb548a5ed264a4b1366294f7abd2d.tar.bz2
Improve gnupload.
* upload/gnupload: Allow user@download.gnu.org.ua as a target. Use canonical hostname (download.gnu.org.ua). Remove obsolete modules. * cvs/sv_logger: Remove. * mc: Remove. * fsf-move/fsf-move: Use `tar cf' to check for its presence. * cvs/sv_sync_www_schedule: Use logger * cvs/sv_www_loginfo: Likewise. * doc/gsc.texi: Update. git-svn-id: file:///svnroot/gsc/trunk@340 d2de0444-eb31-0410-8365-af798a554d48
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog11
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
-rw-r--r--cvs/Makefile.am1
-rwxr-xr-xcvs/sv_logger53
-rwxr-xr-xcvs/sv_sync_www_schedule2
-rwxr-xr-xcvs/sv_www_loginfo2
-rw-r--r--doc/gsc.texi68
-rwxr-xr-xfsf-move/fsf-move6
-rw-r--r--mc/Makefile.am35
-rw-r--r--mc/common.mc28
-rw-r--r--mc/mirddin.mc49
-rw-r--r--mc/relay1.mc111
-rw-r--r--mc/relay2.mc58
-rw-r--r--mc/trurl.mc43
-rw-r--r--mc/ulysses.mc52
-rwxr-xr-xupload/gnupload153
17 files changed, 108 insertions, 569 deletions
diff --git a/ChangeLog b/ChangeLog
index b855c2f..ae634f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-10-29 Sergey Poznyakoff <gray@gnu.org.ua>
+
+ * upload/gnupload: Allow user@download.gnu.org.ua as a target.
+ Use canonical hostname (download.gnu.org.ua).
+ * cvs/sv_logger: Remove.
+ * mc: Remove.
+ * fsf-move/fsf-move: Use `tar cf' to check for its presence.
+ * cvs/sv_sync_www_schedule: Use logger
+ * cvs/sv_www_loginfo: Likewise.
+ * doc/gsc.texi: Update.
+
2010-01-29 Sergey Poznyakoff <gray@gnu.org.ua>
* jabberd: Removed. Use GNU pies instead.
diff --git a/Makefile.am b/Makefile.am
index fcba8a0..5a00989 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,5 @@ SUBDIRS=\
fixnamespace\
fsf-move\
maint\
- mc\
ppp\
rc.d
diff --git a/configure.ac b/configure.ac
index d9dabeb..0f50a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,9 +185,7 @@ AC_CONFIG_FILES([Makefile
gnu/Makefile
lib/Makefile
maint/Makefile
- mc/Makefile
ppp/Makefile
- rc.d/Makefile
- jabberd/Makefile])
+ rc.d/Makefile])
AC_OUTPUT
diff --git a/cvs/Makefile.am b/cvs/Makefile.am
index 708b882..c7b84f3 100644
--- a/cvs/Makefile.am
+++ b/cvs/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_SCRIPTS=sv_post_office.pl sv_mailman_gray.pl
EXTRA_DIST=$(bin_SCRIPTS)
bin_SCRIPTS=\
mksnapshot\
- sv_logger\
sv_sync_www_schedule\
sv_www_loginfo
diff --git a/cvs/sv_logger b/cvs/sv_logger
deleted file mode 100755
index 5d5d0c3..0000000
--- a/cvs/sv_logger
+++ b/dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-# sv_logger: Redirect stdin to syslog.
-# Copyright 2005, 2007 Sergey Poznyakoff
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-PROGNAME=`basename $0`
-T=$PROGNAME
-P=user.notice
-
-usage() {
- cat -<<EOF
-usage: $PROGNAME [-t id] [-p facility.priority]
-
-$PROGNAME reads stdin and forwards it to syslog line by line. By default
-syslog tag $PROGNAME and facility.priority pair $P are used.
-
-Options are:
-
- -t id Specify new syslog tag
- -p facility.priority Use specified facility and priority.
-
-EOF
-}
-
-while getopts "ht:p:" OPTION
-do
- case $OPTION in
- h) usage; exit 0;;
- t) T=$OPTARG;;
- p) P=$OPTARG;;
- *) echo "Try $PROGNAME -h for more information." >&2
- exit 1;;
- esac
-done
-
-while read
-do
- logger -t $T -p $P -- "$REPLY"
-done
-
-# End of sv_logger
diff --git a/cvs/sv_sync_www_schedule b/cvs/sv_sync_www_schedule
index 80ed70a..e8bdf3e 100755
--- a/cvs/sv_sync_www_schedule
+++ b/cvs/sv_sync_www_schedule
@@ -43,6 +43,6 @@ fi
JOBFILE=$JOBDIR/$1
-echo "$1 $2 $3" 2>&1 1>> $JOBFILE | sv_logger -t $PROGNAME -p local1.error
+echo "$1 $2 $3" 2>&1 1>> $JOBFILE | logger -t $PROGNAME -p local1.error
# End of sv_sync_www_schedule
diff --git a/cvs/sv_www_loginfo b/cvs/sv_www_loginfo
index b485682..d1b6a9e 100755
--- a/cvs/sv_www_loginfo
+++ b/cvs/sv_www_loginfo
@@ -52,7 +52,7 @@ EOF
}
case ${1:-start} in
---cr|--cro|--cron) update_loginfos | sv_logger -t $PROGNAME -p local1.info;;
+--cr|--cro|--cron) update_loginfos | logger -t $PROGNAME -p local1.info;;
start) update_loginfos;;
-h|--h|--he|--hel|--help) usage;;
*) echo "$PROGNAME: Unknown switch: $1" >&2;;
diff --git a/doc/gsc.texi b/doc/gsc.texi
index 87e1ce5..ad7c127 100644
--- a/doc/gsc.texi
+++ b/doc/gsc.texi
@@ -69,7 +69,6 @@ documents GSC Version @value{VERSION}.
* Source Tree Utilities:: Batch Modifications to the Source Files.
* Root Utilities:: Various system-related utilities for use by
root.
-* Sendmail mc Files::
* Startup Scripts::
* User Tools:: Just that.
@@ -89,7 +88,6 @@ already listed, mentioned here so you can get to them in one step:
CVS Tools
* mksnapshot:: Create Snapshot Tarballs from the CVS or SVN repository.
-* sv_logger:: Redirect stdin to syslog.
* Sync WWW:: Synchronize a Directory with a CVS Module Upon
Commit.
@@ -165,7 +163,6 @@ is distributed under GFDL, @xref{Copying This Manual}.
@menu
* mksnapshot:: Create Snapshot Tarballs from the CVS or SVN repository.
-* sv_logger:: Redirect stdin to syslog.
* Sync WWW:: Synchronize a Directory with a CVS Module Upon
Commit.
@end menu
@@ -279,28 +276,6 @@ this name. When found, such module is processed as described above.
Thus, only those modules are selected, in which the current user
participates.
-@node sv_logger
-@section sv_logger
-@pindex sv_logger
-
- This program reads its standard input line by line and sends each
-line to the given @command{syslog} priority/facility. It could be used
-to implement logging in shell scripts, especially those run with
-non-root privileges.
-
- The program accepts two arguments:
-
-@table @option
-@item -t @var{tag}
- Specify the syslog @dfn{tag} to use. The tag will appear before
-each logged line. The default tag is @samp{sv_logger}.
-
-@item -p @var{facility}.@var{priority}
- Use specified @command{syslog} facility and priority. See
-@code{syslog.conf(5)} for the list of valid falicity and priority
-values. The default value is @code{user.notice}.
-@end table
-
@node Sync WWW
@section Sync WWW
@cindex CVS synchronization
@@ -819,7 +794,7 @@ algorithm, which is able to find the postal address in the majority of
cases, though not always. Such files should probably be inspected after
@command{fsf-move} finishes its work.
-@node Root Utilities, Sendmail mc Files, Source Tree Utilities, Top
+@node Root Utilities, Startup Scripts, Source Tree Utilities, Top
@chapter Root Utilities
This chapter describes a set of utilities useful in system administration.
@@ -1154,46 +1129,7 @@ actually remove them.
@option{-n}.
@end table
-@node Sendmail mc Files, Startup Scripts, Root Utilities, Top
-@chapter Sendmail @file{mc} Files
-
- These are @command{sendmail} configurations for various machines.
-To compile them you must have @command{sendmail} source tree
-installed.
-
- By default, @command{configure} will look for @command{sendmail}
-source directory in @file{/usr/src} and @file{/usr/local/src}. If it
-finds several @command{sendmail} versions, it will use the one with
-the greatest version number.
-
-@cindex @option{--with-sendmail-cfdir}
- If the @command{sendmail} source directory is located elsewhere,
-specify its exact location with
-@option{--with-sendmail-cfdir=@var{dir}}, for example:
-
-@smallexample
-./configure --with-sendmail-cfdir=$HOME/sendmail-8.13.1
-@end smallexample
-
-@cindex @option{--with-sendmail-version}
- Otherwise, to force @command{configure} to pick up a specified
-version of @command{sendmail}, use
-@option{--with-sendmail-version=@var{version}} option.
-
- Once the package is configured, you can create all @file{.cf}
-files using following command:
-
-@smallexample
-@group
-cd mc
-make cf
-@end group
-@end smallexample
-
- To create only @file{@var{file}.cf}, run @code{make
-@file{@var{file}.cf}}.
-
-@node Startup Scripts, User Tools, Sendmail mc Files, Top
+@node Startup Scripts, User Tools, Root Utilities, Top
@chapter Startup Scripts
This chapter describes several startup files, designed mainly for
diff --git a/fsf-move/fsf-move b/fsf-move/fsf-move
index 2b9e2ea..131ff53 100755
--- a/fsf-move/fsf-move
+++ b/fsf-move/fsf-move
@@ -127,8 +127,8 @@ published by the Free Software Foundation; either version 3
EOT
else
cat > $PATFILE <<EOT
-59 *Temple Place *[,-] *Suite 330, *Boston, *MA *02111-1307[, ]*USA'
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'
+along with this program; if not, write to the Free Software
+along with this program. If not, see <http://www.gnu.org/licenses/>.
EOT
fi
@@ -162,7 +162,7 @@ else
fi
# Check for the right tar version
-if tar tf /dev/null >/dev/null 2>&1; then
+if tar cf /dev/null /etc/passwd >/dev/null 2>&1; then
if [ "$MODE" = "replace" ]; then
VERS=`tar --version | \
sed -n '1{s/tar (GNU tar) \([0-9].*\)/\1/;s/\.[0-9]$//;s/\./ /;p;}' | \
diff --git a/mc/Makefile.am b/mc/Makefile.am
deleted file mode 100644
index 2905bfc..0000000
--- a/mc/Makefile.am
+++ b/dev/null
@@ -1,35 +0,0 @@
-MCFILES=relay1.mc relay2.mc trurl.mc ulysses.mc
-EXTRA_DIST=$(MCFILES)
-SUFFIXES=.mc .cf
-
-cf: $(MCFILES:.mc=.cf)
-
-#ifeq (.sendmail,$(wildcard .sendmail))
-#include .sendmail
-#endif
-
-clean:; rm -f *.cf
-
-.mc.cf:
- @if [ -n "$$CFDIR" ]; then \
- :; \
- elif [ -z "$(SENDMAIL_CFDIR)" ]; then \
- if [ -n "$(SENDMAIL_VERSION)" ]; then \
- for dir in /usr/src /usr/local/src ;\
- do \
- if [ -r $${dir}/sendmail-$(SENDMAIL_VERSION)/cf/cf/Makefile ];\
- then \
- CFDIR=$${dir}/sendmail-$(SENDMAIL_VERSION)/cf; \
- break; \
- fi; \
- done; \
- fi ; \
- if [ -z "$$CFDIR" ]; then \
- echo "Neither SENDMAIL_CFDIR nor SENDMAIL_VERSION set." >&2; \
- echo "Use --with-sendmail-cfdir --with-sendmail-version when configuring" >&2; \
- exit 1; \
- fi; \
- else \
- CFDIR=$(SENDMAIL_CFDIR);\
- fi;\
- $(MAKE) -f $$CFDIR/cf/Makefile CFDIR=$$CFDIR $@
diff --git a/mc/common.mc b/mc/common.mc
deleted file mode 100644
index 756cb94..0000000
--- a/mc/common.mc
+++ b/dev/null
@@ -1,28 +0,0 @@
-divert(0)
-# $Id$
-divert(-1)
-dnl * To eliminate 8->7 bit base64 enconding
-define(`SMTP_MAILER_FLAGS',`8')
-
-dnl * Do not reveal my version number
-define(`confRECEIVED_HEADER',`$?sfrom $s $.$?_($?s$|from $.$_) $.
- by $j$?r with $r$. id $i$?u
- for $u$.; $b')
-dnl * Also, disable HELP,VRFY,EXPN
-define(`HELP_FILE',`none')
-define(`confSMTP_LOGIN_MSG',`$j Sendmail; $b')
-define(`confPRIVACY_FLAGS',`authwarnings,novrfy,noexpn,noetrn,needmailhelo')
-
-define(`confMAX_MESSAGE_SIZE',`5242880')
-
-dnl * File names
-define(`ALIAS_FILE', `/etc/mail/aliases')
-define(`STATUS_FILE', `/etc/mail/sendmail.st')
-define(`confCW_FILE', `-o /etc/mail/sendmail.cw')
-define(`confFORWARD_PATH', `$z/.forward:$z/.forward.$w')
-
-dnl * MSA settings
-DAEMON_OPTIONS(`Name=MTA,Addr=0.0.0.0')
-FEATURE(`no_default_msa')
-DAEMON_OPTIONS(`Port=587,Addr=127.0.0.1, Name=MSA, M=E')
-
diff --git a/mc/mirddin.mc b/mc/mirddin.mc
deleted file mode 100644
index 9de9c84..0000000
--- a/mc/mirddin.mc
+++ b/dev/null
@@ -1,49 +0,0 @@
-dnl * Sendmail configuration for Mirddin
-divert(-1)
-
-VERSIONID(`$Id$')
-OSTYPE(linux)dnl
-
-define(`confCF_VERSION',`Mirddin-Gray-$Revision$')
-
-LOCAL_CONFIG
-# Additional header
-HOrganization: Err, what do you mean?
-HX-Mailutils-Message-Id: $i$?u
-DUmirddin
-Cwmirddin
-
-dnl * Include common defaults
-include(common.mc)
-
-dnl * Site-specific defines
-define(`confTO_COMMAND', `10m')
-define(`confMAX_DAEMON_CHILDREN',`64')
-define(`confCONNECTION_RATE_THROTTLE',`64')
-define(`confFALLBACK_MX',`relay1.farlep.net')
-
-dnl * Features
-FEATURE(use_cw_file)
-FEATURE(redirect)
-FEATURE(always_add_domain)
-FEATURE(access_db, hash -T<TMPF> -o /etc/mail/access)
-FEATURE(mailertable, hash -o /etc/mail/xroutes)
-FEATURE(domaintable, hash -o /etc/mail/domains)
-FEATURE(virtusertable, hash -o /etc/mail/virtusers)
-FEATURE(blacklist_recipients)
-FEATURE(relay_hosts_only)
-FEATURE(dnsbl, `rbl.maps.vix.com')
-FEATURE(dnsbl, `rbl.farlep.net')
-FEATURE(dnsbl, `dialup-rev.farlep.net')
-
-dnl * Mail filters
-dnl include(mirddin.milter)
-
-dnl * Mailers
-undefine(`LOCAL_MAILER_PATH')
-undefine(`_DEF_LOCAL_MAILER_FLAGS')
-define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
-define(`LOCAL_MAILER_ARGS', `mail.local -xl -S %h/.mailutils/filter.sv $u')
-MAILER(local)
-MAILER(smtp)
-
diff --git a/mc/relay1.mc b/mc/relay1.mc
deleted file mode 100644
index 042c5ce..0000000
--- a/mc/relay1.mc
+++ b/dev/null
@@ -1,111 +0,0 @@
-dnl * Sendmail configuration for Relay1
-
-divert(-1)
-
-VERSIONID(`$Id$')
-OSTYPE(linux)dnl
-
-define(`confCF_VERSION',`Relay1 $Revision$')
-
-LOCAL_CONFIG
-# Additional header
-HOrganization: Farlep-Internet
-DUsun
-Cwsun
-
-dnl * Include common defaults
-include(common.mc)
-
-dnl * Site-specific settings
-define(`confMAX_DAEMON_CHILDREN',`256')
-define(`confCONNECTION_RATE_THROTTLE',`128')
-
-dnl * Features
-FEATURE(use_cw_file)
-FEATURE(redirect)
-FEATURE(always_add_domain)
-FEATURE(access_db, hash -o /etc/mail/access -T<TMPF>)
-FEATURE(mailertable, hash -o /etc/mail/xroutes)
-FEATURE(domaintable, hash -o /etc/mail/domains)
-FEATURE(virtusertable, hash -o /etc/mail/virtusers)
-FEATURE(relay_entire_domain)
-FEATURE(blacklist_recipients)
-
-dnl * RBL configuration
-FEATURE(dnsbl,`dialups.mail-abuse.org',` Mail from dial-up rejected; see http://mail-abuse.org/dul/enduser.htm')
-FEATURE(dnsbl, `rbl.farlep.net', ` Stop SPAM from this host')
-FEATURE(dnsbl, `dyn-rbl.farlep.net', ` E-Cards are not allowed to use SMTP')
-
-PUSHDIVERT(8)
-# Allow all addresses from our dialup pool
-R$* $: $&{client_addr}
-R::ffff:$-.$-.$-.$- $: OKSOFAR
-R$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1.dialup-rev.farlep.net. $: OK $)
-R<?>OK $: OKSOFAR
-R<?>$* $@ OKSOFAR
-
-# Jebem ti dusu
-R$* $: $&{client_addr}
-R::ffff:$-.$-.$-.$- $: OKSOFAR
-R213.130.1.225 $@ OKSOFAR
-
-POPDIVERT
-
-FEATURE(dnsbl, `bl.spamcop.net', ` "Spam blocked; see http://spamcop.net/bl.shtml?"$&{client_addr}')
-
-include(`milter.conf')
-
-dnl * *******************************************************
-dnl * Defines for local mailer with quota checking
-dnl * Current mailbox quota is 5mB
-undefine(`LOCAL_MAILER_PATH')
-dnl undefine(`_DEF_LOCAL_MAILER_FLAGS')
-dnl define(`_DEF_LOCAL_MAILER_FLAGS', `lsDFMA5:/|@q')
-dnl define(`LOCAL_MAILER_FLAGS', `SPfhn9')
-
-define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
-define(`SQL_LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
-define(`LOCAL_MAILER_ARGS', `mail -q /etc/mail/userquota -S /home/%u/.filter.scm $u')
-
-MAILER(local)
-
-dnl * Other mailers
-MAILER(smtp)
-
-dnl * Local configuration
-LOCAL_CONFIG
-F{Trusted_Hosts}/etc/mail/trusted_hosts
-FB/etc/mail/accounts
-Kdialup host -T<TEMP>
-Kgetpwnam user
-
-Mlocal-sql, P=/usr/local/libexec/mail.local, F=lsDFMA5:/|@qSPfhn9, S=EnvFromL/HdrFromL, R=EnvToL/HdrToL,
- T=DNS/RFC822/X-Unix,
- A=mail.local -S /var/spool/filter/%u $u
-
-
-LOCAL_RULESETS
-
-SLocal_check_rcpt
-# check address against various regex checks
-R$* $: $>Parse0 $1
-R< $* > $: $1
-R$=B @ $m $@ $| $>"Local_check_allusers" $1
-R$=B @ $=m $#error $: "550 Intet slikt bruker"
-R$=B @ $=w $#error $: "550 Intet slikt bruker"
-
-SLocal_check_allusers
-# check IP address/sender name
-R$* $: $1:$&{client_addr}:$&f
-R$={Trusted_Hosts} $@ OK
-R$* $: ALL:$&{client_addr}:$&f
-R$={Trusted_Hosts} $@ OK
-# anything else is bogus
-R$* $#error $: "550 Ikke tilgjengelig"
-
-SLocal_localaddr
-R$+ $: $1 $| $(getpwnam $1 $: USER $)
-R$+ $| USER $: $>MailerToTriple < local-sql: $1 > $1
-R$* $: $1
-
-
diff --git a/mc/relay2.mc b/mc/relay2.mc
deleted file mode 100644
index dd324a9..0000000
--- a/mc/relay2.mc
+++ b/dev/null
@@ -1,58 +0,0 @@
-dnl * Sendmail configuration for tor.farlep.net
-
-divert(-1)
-
-VERSIONID(`$Id$')
-OSTYPE(linux)dnl
-
-define(`confCF_VERSION',`Relay2 $Revision$')
-
-LOCAL_CONFIG
-# Additional header
-HOrganization: ISP Farlep (Odessa)
-DUtor
-Cwtor
-
-dnl * Include common defaults
-include(common.mc)
-
-dnl * Site-specific settings
-define(`confMAX_DAEMON_CHILDREN',`256')
-define(`confCONNECTION_RATE_THROTTLE',`128')
-
-dnl * Features
-FEATURE(use_cw_file)
-FEATURE(redirect)
-FEATURE(always_add_domain)
-FEATURE(access_db, hash -o -T<TMPF> /etc/mail/access)
-FEATURE(mailertable, hash -o /etc/mail/xroutes)
-FEATURE(domaintable, hash -o /etc/mail/domains)
-FEATURE(blacklist_recipients)
-FEATURE(relay_entire_domain)
-
-dnl * RBL configuration
-
-FEATURE(dnsbl, `dyn-rbl.farlep.net', `"E-Cards are not allowed to use SMTP"')
-
-PUSHDIVERT(8)
-# Allow all addresses from our dialup pool
-R$* $: $&{client_addr}
-R::ffff:$-.$-.$-.$- $: OKSOFAR
-R$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1.dialup-rev.farlep.net. $: OK $)
-R<?>OK $: OKSOFAR
-R<?>$* $@ OKSOFAR
-POPDIVERT
-
-FEATURE(dnsbl, `rbl.farlep.net', `"Stop SPAM from this host"')
-FEATURE(dnsbl, `bl.spamcop.net', `"Spam blocked see; http://spamcop.net/bl.shtml?"$&{client_addr}')
-
-dnl * Milter configuration
-include(`milter.conf')
-
-dnl * Mailers
-undefine(`LOCAL_MAILER_PATH')
-define(`LOCAL_MAILER_PATH', `/usr/libexec/mail.local')
-define(`LOCAL_MAILER_ARGS', `Mail -xt -S /home/%u/.sieve $u')
-
-MAILER(local)
-MAILER(smtp)
diff --git a/mc/trurl.mc b/mc/trurl.mc
deleted file mode 100644
index a89701f..0000000
--- a/mc/trurl.mc
+++ b/dev/null
@@ -1,43 +0,0 @@
-dnl * Sendmail configuration for trurl.gnu.org.ua
-
-divert(-1)
-
-VERSIONID(`$Id$')
-OSTYPE(linux)dnl
-
-define(`confCF_VERSION',`Trurl.gnu.org.ua $Revision$')
-
-# Additional header
-HOrganization: GNU.ORG.UA
-DUtrurl
-Cwtrurl
-
-dnl * Include common defaults
-include(common.mc)
-dnl include(`milter.conf')
-
-dnl * Features
-FEATURE(use_cw_file)
-FEATURE(redirect)
-FEATURE(always_add_domain)
-FEATURE(access_db, hash -o /etc/mail/access -T<TMPF>)
-FEATURE(mailertable, hash -o /etc/mail/xroutes)
-FEATURE(domaintable, hash -o /etc/mail/domains)
-FEATURE(virtusertable, hash -o /etc/mail/virtusers)
-FEATURE(relay_hosts_only)
-FEATURE(blacklist_recipients)
-dnl FEATURE(dnsbl, `rbl.maps.vix.com')
-dnl FEATURE(dnsbl, `rbl.farlep.net')
-dnl FEATURE(dnsbl, `dialup-rev.farlep.net')
-
-dnl * Mailers
-undefine(`LOCAL_MAILER_PATH')
-define(`LOCAL_MAILER_PATH', `/usr/local/sbin/maidag')
-define(`LOCAL_MAILER_ARGS', `maidag -xl --lang=sieve -s %h/.filter.sv $u')
-
-MAILER(local)
-MAILER(smtp)
-
-dnl * Identification string for maidag/Sieve log messages.
-LOCAL_CONFIG
-HX-Mailutils-Message-Id: $i$?u
diff --git a/mc/ulysses.mc b/mc/ulysses.mc
deleted file mode 100644
index ae8b667..0000000
--- a/mc/ulysses.mc
+++ b/dev/null
@@ -1,52 +0,0 @@
-dnl * Sendmail configuration for Ulysses
-
-divert(-1)
-
-VERSIONID(`$Id$')
-OSTYPE(linux)dnl
-
-define(`confCF_VERSION',`Ulysses.gnu.org.ua $Revision$')
-
-LOCAL_CONFIG
-dnl * Identification string for mail.local/Sieve log messages.
-HX-Mailutils-Message-Id: $i$?u
-# Additional header
-HOrganization: GNU.org.ua
-DUulysses
-Cwulysses
-
-dnl * Include common defaults
-include(common.mc)
-
-dnl define(`confFALLBACK_MX',`relay1.farlep.net')
-
-dnl * Features
-FEATURE(use_cw_file)
-FEATURE(redirect)
-FEATURE(always_add_domain)
-FEATURE(access_db, hash -T<TMPF> -o /etc/mail/access)
-FEATURE(mailertable, hash -o /etc/mail/xroutes)
-FEATURE(domaintable, hash -o /etc/mail/domains)
-FEATURE(virtusertable, hash -o /etc/mail/virtusers)
-FEATURE(blacklist_recipients)
-FEATURE(relay_hosts_only)
-FEATURE(dnsbl, `rbl.maps.vix.com')
-FEATURE(dnsbl, `rbl.farlep.net')
-FEATURE(dnsbl, `dialup-rev.farlep.net')
-
-dnl * Mailers
-undefine(`LOCAL_MAILER_PATH')
-undefine(`_DEF_LOCAL_MAILER_FLAGS')
-define(`LOCAL_MAILER_PATH', `/usr/local/libexec/mail.local')
-define(`LOCAL_MAILER_ARGS', `mail.local -xl -S%h/.mailutils/filter.sv $u')
-MAILER(local)
-MAILER(smtp)
-
-dnl * Mail filters
-include(ulysses.milter)
-
-LOCAL_RULESETS
-
-SLocal_localaddr
-Rtempfail+mailfromd-test $#error $@ 4.7.0 $: "450 Temporarily not available [Mailfromd test suite]"
-
diff --git a/upload/gnupload b/upload/gnupload
index 8e3e392..3ec9761 100755
--- a/upload/gnupload
+++ b/upload/gnupload
@@ -1,7 +1,7 @@
#!/bin/sh
# Sign files and upload them.
-scriptversion=2009-01-23.23
+scriptversion=2009-02-17.10
# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
#
@@ -24,12 +24,12 @@ set -e
GPG='gpg --batch --no-tty'
to=
-DRY_RUN=
-SYMLINK_FILES=
-DELETE_FILES=
-DELETE_SYMLINKS=
-COLLECT_VAR=
-DBG=
+dry_run=
+symlink_files=
+delete_files=
+delete_symlinks=
+collect_var=
+dbg=
usage="Usage: $0 [OPTIONS]... [COMMAND] FILES... [[COMMAND] FILES...]
@@ -39,21 +39,20 @@ Sign all FILES, and upload them to selected destinations, according to
Commands:
--delete delete FILES from destination
--symlink create symbolic links
- --rmsymlink remove symbolic links
+ --rmsymlink remove symbolic links
-- treat the remaining arguments as files to upload
-
+
Options:
--help print this help text and exit
--to DEST specify one destination for FILES
(multiple --to options are allowed)
--user NAME sign with key NAME
- --symlink-re[=SED-EXPR] use SED-EXPR to create symbolic links
- --dry-run do nothing, show everything
+ --symlink-regex[=SED-EXPR] use SED-EXPR to create symbolic links
+ --dry-run do nothing, show what would have been done
--version output version information and exit
-If --symlink-re without SED-EXPR is given, symlink target name is
-created by replacing version information with the word \`-latest',
-e.g.:
+If --symlink-re is given without SED-EXPR, then the link target name
+is created by replacing the version information with \`-latest', e.g.:
foo-1.3.4.tar.gz -> foo-latest.tar.gz
@@ -63,12 +62,12 @@ Recognized destinations are:
savannah.nongnu.org:DIRECTORY
ftp.gnu.org:DIRECTORY
build directive files and upload files by FTP
- download.gnu.org.ua:{alpha|ftp}/DIRECTORY
+ [user@]download.gnu.org.ua:{alpha|ftp}/DIRECTORY
build directive files and upload files by SFTP
[user@]host:DIRECTORY upload files with scp
If the file .gnupload exists in the current working directory, its contents
-is prepended to the actual command line options. Use this to keep your
+are prepended to the actual command line options. Use this to keep your
defaults. Comments (#) and empty lines in .gnupload are allowed.
Examples:
@@ -80,7 +79,7 @@ Examples:
2. Same as above, but also create symbolic links to automake-latest.tar.*:
gnupload --to sources.redhat.com:~ftp/pub/automake \\
--to alpha.gnu.org:automake \\
- --symlink-re \\
+ --symlink-regex \\
automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
3. Symlink automake-1.8.2b.tar.gz to automake-latest.tar.gz and
@@ -89,7 +88,7 @@ automake-1.8.2b.tar.bz2 to automake-latest.tar.bz2 on both sites:
gnupload --to sources.redhat.com:~ftp/pub/automake \\
--to alpha.gnu.org:automake \\
--symlink automake-1.8.2b.tar.gz automake-latest.tar.gz \\
- automake-latest.tar.bz2 automake-latest.tar.bz2
+ automake-1.8.2b.tar.bz2 automake-latest.tar.bz2
4. Delete automake-1.8.2a.tar.gz and .bz2, remove symlink
automake-latest.tar.gz and upload automake-1.8.2b.tar.gz:
@@ -105,14 +104,14 @@ Report bugs to <bug-automake@gnu.org>.
Send patches to <automake-patches@gnu.org>."
# Read local configuration file
-if [ -r .gnupload ]; then
+if test -r .gnupload; then
echo "$0: Reading configuration file .gnupload"
- eval set -- "`sed 's/#.*$//;/^$/d' .gnupload | tr '\n' ' '` $*"
+ eval set -- "`sed 's/#.*$//;/^$/d' .gnupload | tr '\012\015' ' '` $@"
fi
-
+
while test -n "$1"; do
case $1 in
- -*) COLLECT_VAR=
+ -*) collect_var=
case $1 in
--help)
echo "$usage"
@@ -137,27 +136,27 @@ while test -n "$1"; do
fi
;;
--delete)
- COLLECT_VAR=DELETE_FILES
+ collect_var=delete_files
shift
;;
--rmsymlink)
- COLLECT_VAR=DELETE_SYMLINKS
+ collect_var=delete_symlinks
shift
;;
- --symlink-re=*)
- SYMLINK_EXPR=${1##--symlink=}
+ --symlink-regex=*)
+ symlink_expr=`expr "$1" : '[^=]*=\(.*\)'`
shift
;;
- --symlink-re)
- SYMLINK_EXPR='s|-[0-9][0-9\.]*\(-[0-9][0-9]*\)\?\.|-latest.|'
+ --symlink-regex)
+ symlink_expr='s|-[0-9][0-9\.]*\(-[0-9][0-9]*\)\{0,1\}\.|-latest.|'
shift
;;
--symlink)
- COLLECT_VAR=SYMLINK_FILES
+ collect_var=symlink_files
shift
;;
--dry-run|-n)
- DRY_RUN=1
+ dry_run=1
shift
;;
--version)
@@ -174,22 +173,23 @@ while test -n "$1"; do
;;
esac
;;
- *) if test -z "$COLLECT_VAR"; then
+ *) if test -z "$collect_var"; then
break
else
- eval $COLLECT_VAR=\"\$$COLLECT_VAR $1\"
+ eval $collect_var=\"\$$collect_var \"$1\"\"
shift
fi
;;
- esac
+ esac
done
-dprint() {
+dprint()
+{
echo "Running $*..."
}
-if test -n "$DRY_RUN"; then
- DBG=dprint
+if test -n "$dry_run"; then
+ dbg=dprint
fi
if test -z "$to"; then
@@ -197,15 +197,16 @@ if test -z "$to"; then
exit 1
fi
-if test -n "$SYMLINK_FILES"; then
- if test -n "`echo "$SYMLINK_FILES" | sed 's/[^ ]//g;s/ //g'`"; then
+if test -n "$symlink_files"; then
+ x=`echo "$symlink_files" | sed 's/[^ ]//g;s/ //g'`
+ if test -n "$x"; then
echo "$0: Odd number of symlink arguments" >&2
exit 1
fi
-fi
+fi
if test $# = 0; then
- if test -z "${SYMLINK_FILES}${DELETE_FILES}${DELETE_SYMLINKS}"; then
+ if test -z "${symlink_files}${delete_files}${delete_symlinks}"; then
echo "$0: No file to upload" 1>&2
exit 1
fi
@@ -217,8 +218,8 @@ else
if test ! -f $file; then
echo "$0: Cannot find \`$file'" 1>&2
exit 1
- elif test -n "$SYMLINK_EXPR"; then
- linkname=`echo $file | sed "$SYMLINK_EXPR"`
+ elif test -n "$symlink_expr"; then
+ linkname=`echo $file | sed "$symlink_expr"`
if test -z "$linkname"; then
echo "$0: symlink expression produces empty results" >&2
exit 1
@@ -262,13 +263,13 @@ mkdirective() {
stmt="
filename: $3$stmt"
fi
-
+
cat >${2}.directive<<EOF
version: 1.1
directory: $1
-comment: Gray's gnupload v. $scriptversion$stmt
+comment: gnupload v. $scriptversion$stmt
EOF
- if test -n "$DRY_RUN"; then
+ if test -n "$dry_run"; then
echo "File ${2}.directive:"
cat ${2}.directive
echo "File ${2}.directive:" | sed 's/./-/g'
@@ -299,49 +300,73 @@ upload() {
file=$4
stmt=$5
files=$6
-
+
rm -f $base.directive $base.directive.asc
case $dest in
alpha.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
- $DBG ncftpput ftp-upload.gnu.org /incoming/alpha $files $base.directive.asc
+ $dbg ncftpput ftp-upload.gnu.org /incoming/alpha $files $base.directive.asc
;;
ftp.gnu.org:*)
mkdirective "$destdir" "$base" "$file" "$stmt"
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
- $DBG ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
+ $dbg ncftpput ftp-upload.gnu.org /incoming/ftp $files $base.directive.asc
+ ;;
+ gnupload-test.gnu.org.ua:*)
+ mkdirective "${destdir#*/}" "$base" "$file" "$stmt"
+ echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
+ $dbg ncftpput gnupload-test.gnu.org.ua /incoming/${destdir%%/*} $files $base.directive.asc
+ ;;
+ localhost:*)
+ mkdirective "$destdir" "$base" "$file" "$stmt"
+ echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
+ $dbg ncftpput localhost /incoming/ftp $files $base.directive.asc
;;
savannah.gnu.org:*)
if test -z "$files"; then
echo "$0: warning: standalone directives not applicable for $dest" >&2
fi
- $DBG ncftpput savannah.gnu.org /incoming/savannah/$destdir $files
+ $dbg ncftpput savannah.gnu.org /incoming/savannah/$destdir $files
;;
savannah.nongnu.org:*)
if test -z "$files"; then
echo "$0: warning: standalone directives not applicable for $dest" >&2
fi
- $DBG ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files
+ $dbg ncftpput savannah.nongnu.org /incoming/savannah/$destdir $files
;;
- download.gnu.org.ua:alpha/*|download.gnu.org.ua:ftp/*)
+ download.gnu.org.ua:alpha/*|download.gnu.org.ua:ftp/*|download.gnu.org.ua:test/*)
mkdirective "${destdir#*/}" "$base" "$file" "$stmt"
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
for f in $files $base.directive.asc
do
echo put $f
- done | $DBG sftp -b - puszcza.gnu.org.ua:/incoming/${destdir%%/*}
+ done | $dbg sftp -b - download.gnu.org.ua:/incoming/${destdir%%/*}
+ ;;
+ *@download.gnu.org.ua:alpha/*|*@download.gnu.org.ua:ftp/*|*@download.gnu.org.ua:test/*)
+ mkdirective "${destdir#*/}" "$base" "$file" "$stmt"
+ echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
+ for f in $files $base.directive.asc
+ do
+ echo put $f
+ done | $dbg sftp -b - download.gnu.org.ua:/incoming/${destdir%%/*}
;;
/*)
mkdirective "$destdir" "$base" "$file" "$stmt"
echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
- $DBG cp $files $base.directive.asc ${dest%%:*}
+ $dbg cp $files $base.directive.asc ${dest%%:*}
;;
*)
if test -z "$files"; then
echo "$0: warning: standalone directives not applicable for $dest" >&2
fi
- $DBG scp $files $dest
+ if test -n "$DESTDIR"; then
+ mkdirective "$DESTDIR" "$base" "$file" "$stmt"
+ echo "$passphrase" | $GPG --passphrase-fd 0 --clearsign $base.directive
+ $dbg scp $files $base.directive.asc $dest
+ else
+ $dbg scp $files $dest
+ fi
;;
esac
rm -f $base.directive $base.directive.asc
@@ -350,22 +375,22 @@ upload() {
#####
# Process any standalone directives
stmt=
-if test -n "$SYMLINK_FILES"; then
+if test -n "$symlink_files"; then
stmt="$stmt
-`mksymlink $SYMLINK_FILES`"
+`mksymlink $symlink_files`"
fi
-for file in $DELETE_FILES
+for file in $delete_files
do
stmt="$stmt
archive: $file"
-done
+done
-for file in $DELETE_SYMLINKS
+for file in $delete_symlinks
do
stmt="$stmt
rmsymlink: $file"
-done
+done
if test -n "$stmt"; then
for dest in $to
@@ -375,7 +400,7 @@ if test -n "$stmt"; then
done
fi
-# Process actual uploads
+# Process actual uploads
for dest in $to
do
for file
@@ -384,9 +409,9 @@ do
stmt=
files="$file $file.sig"
destdir=`echo $dest | sed 's/[^:]*://'`
- if test -n "$SYMLINK_EXPR"; then
- linkname=`echo $file | sed "$SYMLINK_EXPR"`
- stmt="$stmt
+ if test -n "$symlink_expr"; then
+ linkname=`echo $file | sed "$symlink_expr"`
+ stmt="$stmt
symlink: $file $linkname
symlink: $file.sig $linkname.sig"
fi

Return to:

Send suggestions and report system problems to the System administrator.