ctmbsd-cvs-all Mailing List for CTMBSD
Status: Planning
Brought to you by:
sagamore
You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
(1) |
Apr
(7) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: Roman <sag...@us...> - 2005-04-05 22:11:41
|
Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26266 Modified Files: loginfo Log Message: Block generic syncmail Index: loginfo =================================================================== RCS file: /cvsroot/ctmbsd/CVSROOT/loginfo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- loginfo 5 Apr 2005 22:08:57 -0000 1.5 +++ loginfo 5 Apr 2005 22:11:17 -0000 1.6 @@ -26,5 +26,5 @@ # or #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog -ALL /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -u %{sVv} ctm...@li... +#ALL /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -u %{sVv} ctm...@li... ALL $CVSROOT/CVSROOT/cvstools/syncmail -u %{s} ctm...@li... |
From: Roman <sag...@us...> - 2005-04-05 22:11:27
|
sagamore 2005-04-05 22-11-18 UTC CTMBSD CVSROOT module Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26266 Modified Files: loginfo Log Message: Block generic syncmail 'loginfo': +1 -1, 1.6 http://cvs.sourceforge.net/viewcvs.py/ctmbsd/CVSROOT/loginfo?r1=1.5&r2=1.6&diff_format=u |
From: Roman <sag...@us...> - 2005-04-05 22:09:08
|
Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25446 Modified Files: loginfo Log Message: Forced commit to check my syncmail |
From: Roman <sag...@us...> - 2005-04-05 22:09:07
|
sagamore 2005-04-05 22-08-58 UTC CTMBSD CVSROOT module Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25446 Modified Files: loginfo Log Message: Forced commit to check my syncmail 'loginfo': +0 -0, 1.5 http://cvs.sourceforge.net/viewcvs.py/ctmbsd/CVSROOT/loginfo?r1=1.4&r2=1.5&diff_format=u |
From: Roman <sag...@us...> - 2005-04-05 22:07:36
|
Update of /cvsroot/ctmbsd/CVSROOT/cvstools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24938/cvstools Added Files: syncmail Log Message: Switch to my version of syncmail --- NEW FILE: syncmail --- #! /usr/bin/python # Copyright (c) 2002, 2003, 2004 Barry Warsaw, Fred Drake, and contributors # All rights reserved. # See the accompanying LICENSE file for details. # NOTE: SourceForge currently runs Python 2.2.3, so we need to remain # compatible with the Python 2.2 line. """Complicated notification for CVS checkins. This script is used to provide email notifications of changes to the CVS repository. These email changes will include context diffs of the changes. Really big diffs will be trimmed. This script is run from a CVS loginfo file (see $CVSROOT/CVSROOT/loginfo). To set this up, create a loginfo entry that looks something like this: mymodule /path/to/this/script %%s som...@yo...main In this example, whenever a checkin that matches `mymodule' is made, this script is invoked, which will generate the diff containing email, and send it to som...@yo...main. Note: This module used to also do repository synchronizations via rsync-over-ssh, but since the repository has been moved to SourceForge, this is no longer necessary. The syncing functionality has been ripped out in the 3.0, which simplifies it considerably. Access the 2.x versions to refer to this functionality. Because of this, the script is misnamed. It no longer makes sense to run this script from the command line. Doing so will only print out this usage information. Usage: %(PROGRAM)s [options] <%%S> email-addr [email-addr ...] Where options are: --cvsroot=<path> Use <path> as the environment variable CVSROOT. Otherwise this variable must exist in the environment. --context=# -C # Include # lines of context around lines that differ (default: 2). -c Produce a context diff (default). -m hostname --mailhost hostname The hostname of an available SMTP server. The default is 'localhost'. -u Produce a unified diff (smaller). -S TEXT --subject-prefix=TEXT Prepend TEXT to the email subject line. -R ADDR --reply-to=ADDR Add a "Reply-To: ADDR" header to the email message. --quiet / -q Don't print as much status to stdout. --fromhost=hostname -f hostname The hostname that email messages appear to be coming from. The From: header of the outgoing message will look like user@hostname. By default, hostname is the machine's fully qualified domain name. --help / -h Print this text. The rest of the command line arguments are: <%%S> CVS %%s loginfo expansion. When invoked by CVS, this will be a single string containing the directory the checkin is being made in, relative to $CVSROOT, followed by the list of files that are changing. If the %%s in the loginfo file is %%{sVv}, context diffs for each of the modified files are included in any email messages that are generated. email-addrs At least one email address. """ __version__ = '$Revision: 1.1 $' import os import re import pwd import sys import time import getopt import socket import smtplib from cStringIO import StringIO from email.Utils import formataddr # Script behaviour MAIL_ON_DIR_CREATION = 0 MAIL_ON_IMPORTED_SOURCES = 1 # Which SMTP server to do we connect to? MAILHOST = 'localhost' MAILPORT = 25 # Diff trimming stuff DIFF_HEAD_LINES = 20 DIFF_TAIL_LINES = 20 DIFF_TRUNCATE_IF_LARGER = 1000 COMMASPACE = ', ' PROGRAM = sys.argv[0] BINARY_EXPLANATION_LINES = [ "(This appears to be a binary file; contents omitted.)\n" ] NOVERSION = "Couldn't generate diff; no version number found for file: %s" BACKSLASH = "Couldn't generate diff: backslash in filespec's filename: %s" def usage(code, msg=''): print __doc__ % globals() if msg: print msg sys.exit(code) def calculate_count(entries): num = 0 for i in entries: num = num + 1 return num def calculate_summ(entry, contextlines): file = entry.name oldrev = entry.revision newrev = entry.new_revision msg = '' # Make sure we can find a CVS version number if oldrev is None and newrev is None: return NOVERSION % file if file.find("'") <> -1: # Those crazy users put single-quotes in their file names! Now we # have to escape everything that is meaningful inside double-quotes. filestr = filestr.replace('\\', '\\\\') filestr = filestr.replace('`', '\`') filestr = filestr.replace('"', '\"') filestr = filestr.replace('$', '\$') # and quote it with double-quotes. filestr = '"' + filestr + '"' else: # quote it with single-quotes. filestr = "'" + file + "'" if oldrev is None: # File is being added. try: if os.path.exists(file): fp = open(file) else: update_cmd = "cvs -fnQ update -r %s -p %s" % (newrev, filestr) fp = os.popen(update_cmd) lines = fp.readlines() fp.close() status_cmd = "cvs -fnQ status %s" % filestr repo_rev = re.compile(r"^\s*Repository revision") repo_suf = re.compile(r",v$") repo_path = "" fp1 = os.popen(status_cmd) while 1: line = fp1.readline() if not line: break if repo_rev.match (line): repo_path = line.split()[3] break fp1.close() # Probably I shouldn't remove /Attic/ repo_path = re.sub('/Attic/', '/', repo_path) repo_path = re.sub(os.environ['CVSROOT'], '', repo_path) repo_path = re.sub(repo_suf, '', repo_path) msg = filestr + ': +' + `calculate_count(lines)` + ' -0, ' + newrev + "(new)" msg = msg + '\n\thttp://cvs.sourceforge.net/viewcvs.py/*checkout*/ctmbsd'+repo_path+"?rev="+newrev+"&view=markup" except IOError, e: msg = ['***** Error reading new file: ', str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()] elif newrev is None: # File is being deleted. try: oldrev = re.sub('^-', '', oldrev) if os.path.exists(file): fp = open(file) else: update_cmd = "cvs -fnQ update -r %s -p %s" % (oldrev, filestr) fp = os.popen(update_cmd) lines = fp.readlines() fp.close() status_cmd = "cvs -fnQ status %s" % filestr repo_rev = re.compile(r"^\s*Repository revision") repo_suf = re.compile(r",v$") repo_path = "" fp1 = os.popen(status_cmd) while 1: line = fp1.readline() if not line: break if repo_rev.match (line): repo_path = line.split()[3] break fp1.close() # Probably I shouldn't remove /Attic/ repo_path = re.sub('/Attic/', '/', repo_path) repo_path = re.sub(os.environ['CVSROOT'], '', repo_path) repo_path = re.sub(repo_suf, '', repo_path) msg = filestr + ': +0 -' + `calculate_count(lines)` + ', ' + oldrev + "(del)" msg = msg + '\n\thttp://cvs.sourceforge.net/viewcvs.py/*checkout*/ctmbsd'+repo_path+"?rev="+oldrev+"&view=markup" except IOError, e: msg = ['***** Error reading new file: ', str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()] else: # File has been changed. # This /has/ to happen in the background, otherwise we'll run into CVS # lock contention. What a crock. diffcmd = "/usr/bin/cvs -fnQ log -r%s %s" \ % (newrev, filestr) fp = os.popen(diffcmd) delta_re = re.compile(r"^date:.*lines:") repo_rcs = re.compile(r"^RCS file:\s") repo_suf = re.compile(r",v$") repo_path = "" delta = " +0 -0" while 1: line = fp.readline() if not line: break if delta_re.match (line): delta = re.sub(delta_re, '', line) continue if repo_rcs.match (line): repo_path = re.sub(repo_rcs, '', line) continue delta = re.sub('^\s', '', delta) delta = re.sub('\s$', '', delta) repo_path = re.sub('/Attic/', '/', repo_path) repo_path = re.sub(os.environ['CVSROOT'], '', repo_path) repo_path = re.sub(repo_suf, '', repo_path) repo_path = re.sub('^\s', '', repo_path) repo_path = re.sub('\s$', '', repo_path) # ignore the error code, it always seems to be 1 :( fp.close() msg = filestr + ': ' + delta + ', ' + newrev msg = msg + '\n\thttp://cvs.sourceforge.net/viewcvs.py/ctmbsd'+repo_path+"?r1="+oldrev+"&r2="+newrev+"&diff_format=u" return msg def calculate_diff(entry, contextlines): file = entry.name oldrev = entry.revision newrev = entry.new_revision # Make sure we can find a CVS version number if oldrev is None and newrev is None: return NOVERSION % file if file.find("'") <> -1: # Those crazy users put single-quotes in their file names! Now we # have to escape everything that is meaningful inside double-quotes. filestr = filestr.replace('\\', '\\\\') filestr = filestr.replace('`', '\`') filestr = filestr.replace('"', '\"') filestr = filestr.replace('$', '\$') # and quote it with double-quotes. filestr = '"' + filestr + '"' else: # quote it with single-quotes. filestr = "'" + file + "'" if oldrev is None: # File is being added. try: if os.path.exists(file): fp = open(file) else: update_cmd = "cvs -fn update -r %s -p %s" % (newrev, filestr) fp = os.popen(update_cmd) lines = fp.readlines() fp.close() # Is this a binary file? Let's look at the first few # lines to figure it out: for line in lines[:5]: for c in line.rstrip(): if c.isspace(): continue if c < ' ' or c > chr(127): lines = BINARY_EXPLANATION_LINES[:] break lines.insert(0, '--- NEW FILE: %s ---\n' % file) except IOError, e: lines = ['***** Error reading new file: ', str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()] elif newrev is None: lines = ['--- %s DELETED ---\n' % file] else: # File has been changed. # This /has/ to happen in the background, otherwise we'll run into CVS # lock contention. What a crock. if contextlines > 0: difftype = "-C " + str(contextlines) else: difftype = "-u" diffcmd = "/usr/bin/cvs -f diff -kk %s --minimal -r %s -r %s %s" \ % (difftype, oldrev, newrev, filestr) fp = os.popen(diffcmd) lines = fp.readlines() # ignore the error code, it always seems to be 1 :( fp.close() if len(lines) > DIFF_TRUNCATE_IF_LARGER: removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES] lines.insert(DIFF_HEAD_LINES, '[...%d lines suppressed...]\n' % removedlines) return ''.join(lines) rfc822_specials_re = re.compile(r'[\(\)\<\>\@\,\;\:\\\"\.\[\]]') def quotename(name): if name and rfc822_specials_re.search(name): return '"%s"' % name.replace('"', '\\"') else: return name def blast_mail(subject, people, body, entries, contextlines, fromhost, replyto): # cannot wait for child process or that will cause parent to retain cvs # lock for too long. Urg! if not os.fork(): # in the child # give up the lock you cvs thang! time.sleep(2) # Create the smtp connection to the localhost conn = smtplib.SMTP() conn.connect(MAILHOST, MAILPORT) pwinfo = pwd.getpwuid(os.getuid()) user = pwinfo[0] name = pwinfo[4] domain = fromhost or socket.getfqdn() address = '%s@%s' % (user, domain) s = StringIO() datestamp = time.strftime('%a, %d %b %Y %H:%M:%S +0000', time.gmtime(time.time())) vars = {'author' : formataddr((name, address)), 'people' : COMMASPACE.join(people), 'subject' : subject, 'version' : __version__, 'date' : datestamp, } print >> s, '''\ From: %(author)s To: %(people)s''' % vars if replyto: print >> s, 'Reply-To: %s' % replyto print >>s, '''\ Subject: %(subject)s Date: %(date)s X-Mailer: Python syncmail %(version)s <http://sf.net/projects/cvs-syncmail> ''' % vars s.write(body) # append the diffs if available print >> s for entry in entries: print >> s, calculate_summ(entry, contextlines) resp = conn.sendmail(address, people, s.getvalue()) conn.close() os._exit(0) class CVSEntry: def __init__(self, name, revision, timestamp, conflict, options, tagdate): self.name = name self.revision = revision self.timestamp = timestamp self.conflict = conflict self.options = options self.tagdate = tagdate def get_entry(prefix, mapping, line, filename): line = line.strip() parts = line.split("/") _, name, revision, timestamp, options, tagdate = parts key = namekey(prefix, name) try: entry = mapping[key] except KeyError: if revision == "0": revision = None if timestamp.find("+") != -1: timestamp, conflict = tuple(timestamp.split("+")) else: conflict = None entry = CVSEntry(key, revision, timestamp, conflict, options, tagdate) mapping[key] = entry return entry def namekey(prefix, name): if prefix: return os.path.join(prefix, name) else: return name def load_change_info(prefix=None): if prefix is not None: entries_fn = os.path.join(prefix, "CVS", "Entries") else: entries_fn = os.path.join("CVS", "Entries") entries_log_fn = entries_fn + ".Log" mapping = {} if os.path.exists(entries_fn): f = open(entries_fn) while 1: line = f.readline() if not line: break ## if line.strip() == "D": ## continue # we could recurse down subdirs, except the Entries.Log files # we need haven't been written to the subdirs yet, so it # doesn't do us any good ## if line[0] == "D": ## name = line.split("/")[1] ## dirname = namekey(prefix, name) ## if os.path.isdir(dirname): ## m = load_change_info(dirname) ## mapping.update(m) if line[0] == "/": # normal file get_entry(prefix, mapping, line, entries_fn) # else: bogus Entries line f.close() else: print entries_fn,' path does not exists' if os.path.isfile(entries_log_fn): f = open(entries_log_fn) while 1: line = f.readline() if not line: break if line[1:2] != ' ': # really old version of CVS break entry = get_entry(prefix, mapping, line[2:], entries_log_fn) parts = line.split("/")[1:] if line[0] == "A": # adding a file entry.new_revision = parts[1] elif line[0] == "R": # removing a file entry.new_revision = None f.close() for entry in mapping.values(): if not hasattr(entry, "new_revision"): print 'confused about file', entry.name, '-- ignoring' del mapping[entry.name] return mapping def load_branch_name(): tag_fn = os.path.join("CVS", "Tag") if os.path.isfile(tag_fn): f = open(tag_fn) line = f.readline().strip() f.close() if line[:1] == "T": return line[1:] return None def build_header(argv): s = StringIO() u = pwd.getpwuid(os.getuid())[0] d = time.strftime('%Y-%m-%d %H-%M-%S UTC', time.gmtime(time.time())) print >> s, "%-8s %s" % (u, d) print >> s, "" print >> s, " CTMBSD %s module" % argv.split('/')[0] print >> s, "" return s.getvalue() # scan args for options def main(): # XXX Should really move all the options to an object, just to # avoid threading so many positional args through everything. try: opts, args = getopt.getopt( sys.argv[1:], 'hC:cuS:R:qf:m:', ['fromhost=', 'context=', 'cvsroot=', 'mailhost=', 'subject-prefix=', 'reply-to=', 'help', 'quiet']) except getopt.error, msg: usage(1, msg) # parse the options contextlines = 2 verbose = 1 subject_prefix = "" replyto = None fromhost = None for opt, arg in opts: if opt in ('-h', '--help'): usage(0) elif opt == '--cvsroot': os.environ['CVSROOT'] = arg elif opt in ('-C', '--context'): contextlines = int(arg) elif opt == '-c': if contextlines <= 0: contextlines = 2 elif opt == '-u': contextlines = 0 elif opt in ('-S', '--subject-prefix'): subject_prefix = arg elif opt in ('-R', '--reply-to'): replyto = arg elif opt in ('-q', '--quiet'): verbose = 0 elif opt in ('-f', '--fromhost'): fromhost = arg elif opt in ('-m', '--mailhost'): global MAILHOST MAILHOST = arg # What follows is the specification containing the files that were # modified. The argument actually must be split, with the first component # containing the directory the checkin is being made in, relative to # $CVSROOT, followed by the list of files that are changing. if not args: usage(1, 'No CVS module specified') subject = subject_prefix + args[0] specs = args[0].split() input_params = args[0] del args[0] # The remaining args should be the email addresses if not args: usage(1, 'No recipients specified') # Now do the mail command people = args # New directory if specs[-3:] == ['-', 'New', 'directory']: if MAIL_ON_DIR_CREATION: msg = build_header(specs[0]) msg = msg + ' ' + input_params blast_mail(subject, people, msg, [], contextlines, fromhost, replyto) else: print 'New directory: Not sending email.' return # Imported sources if specs[-3:] == ['-', 'Imported', 'sources']: if MAIL_ON_IMPORTED_SOURCES: msg = build_header(specs[0]) msg = msg + ' ' + input_params msg = msg + '\n\n' while 1: line = sys.stdin.readline() if not line: break msg = msg + ' ' + line blast_mail(subject, people, msg, [], contextlines, fromhost, replyto) else: print 'Imported sources: Not sending email.' return # Normal case branch = load_branch_name() changes = load_change_info() if verbose: print 'Mailing %s...' % COMMASPACE.join(people) print 'Generating notification message...' blast_mail(subject, people, build_header (specs[0]) + sys.stdin.read(), changes.values(), contextlines, fromhost, replyto) if verbose: print 'Generating notification message... done.' if __name__ == '__main__': main() sys.exit(0) |
From: Roman <sag...@us...> - 2005-04-05 22:07:34
|
Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24938 Modified Files: checkoutlist loginfo Log Message: Switch to my version of syncmail Index: checkoutlist =================================================================== RCS file: /cvsroot/ctmbsd/CVSROOT/checkoutlist,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- checkoutlist 21 Mar 2005 19:13:43 -0000 1.1 +++ checkoutlist 5 Apr 2005 22:07:15 -0000 1.2 @@ -11,3 +11,4 @@ # [<whitespace>]<filename>[<whitespace><error message>]<end-of-line> # # comment lines begin with '#' +cvstools/syncmail Index: loginfo =================================================================== RCS file: /cvsroot/ctmbsd/CVSROOT/loginfo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- loginfo 24 Mar 2005 23:25:41 -0000 1.3 +++ loginfo 5 Apr 2005 22:07:26 -0000 1.4 @@ -27,3 +27,4 @@ #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog ALL /cvsroot/sitedocs/CVSROOT/cvstools/syncmail -u %{sVv} ctm...@li... +ALL $CVSROOT/CVSROOT/cvstools/syncmail -u %{s} ctm...@li... |
From: Roman <sag...@us...> - 2005-04-05 21:59:19
|
Update of /cvsroot/ctmbsd/CVSROOT/cvstools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22229/cvstools Log Message: Directory /cvsroot/ctmbsd/CVSROOT/cvstools added to the repository |
From: Roman <sag...@us...> - 2005-03-24 23:25:49
|
Update of /cvsroot/ctmbsd/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4300 Modified Files: loginfo Log Message: Forced commit to check that all is fine. |