diff -u sendpage-1.0.3/debian/patches/manpages.patch sendpage-1.0.3/debian/patches/manpages.patch --- sendpage-1.0.3/debian/patches/manpages.patch +++ sendpage-1.0.3/debian/patches/manpages.patch @@ -1,7 +1,7 @@ Index: sendpage-1.0.3/sendmail2snpp =================================================================== ---- sendpage-1.0.3.orig/sendmail2snpp 2008-08-16 19:19:56.000000000 -0700 -+++ sendpage-1.0.3/sendmail2snpp 2008-08-16 19:23:12.000000000 -0700 +--- sendpage-1.0.3.orig/sendmail2snpp 2009-05-19 07:13:02.000000000 -0700 ++++ sendpage-1.0.3/sendmail2snpp 2009-05-19 07:13:28.000000000 -0700 @@ -22,6 +22,34 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # http://www.gnu.org/copyleft/gpl.html @@ -39,9 +39,9 @@ $cmd="email2page | snpp ".join(" ",@ARGV); Index: sendpage-1.0.3/sendpage-db =================================================================== ---- sendpage-1.0.3.orig/sendpage-db 2008-08-16 19:19:47.000000000 -0700 -+++ sendpage-1.0.3/sendpage-db 2008-08-16 19:21:13.000000000 -0700 -@@ -22,6 +22,78 @@ +--- sendpage-1.0.3.orig/sendpage-db 2009-05-19 07:13:02.000000000 -0700 ++++ sendpage-1.0.3/sendpage-db 2009-05-19 07:14:57.000000000 -0700 +@@ -22,6 +22,71 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # http://www.gnu.org/copyleft/gpl.html @@ -56,13 +56,6 @@ +=head1 OPTIONS + +=over 4 -+ printf STDERR "-v verbose\n"; -+ printf STDERR "-p show table entries\n"; -+ printf STDERR "-a add an entry\n"; -+ printf STDERR "-d remove an entry\n"; -+ printf STDERR "-c database connection type, e.g. dbi:mysql:\n"; -+ printf STDERR "-U database user (optional)\n"; -+ printf STDERR "-P database password (optional)\n"; + +=item -c DB_TYPE + diff -u sendpage-1.0.3/debian/README.Debian sendpage-1.0.3/debian/README.Debian --- sendpage-1.0.3/debian/README.Debian +++ sendpage-1.0.3/debian/README.Debian @@ -13 +13 @@ -Kees Cook , Sat, 16 Aug 2007 10:55:12 -0700 +Kees Cook diff -u sendpage-1.0.3/debian/copyright sendpage-1.0.3/debian/copyright --- sendpage-1.0.3/debian/copyright +++ sendpage-1.0.3/debian/copyright @@ -3,11 +3,11 @@ Thu, 29 Mar 2001 20:48:57 -0500, updated by Kees Cook on Sat, 16 Aug 2008 11:41:12 -0700. -The package has a home page at http://sendpage.cpoint.net/ +The package has a home page at http://sendpage.org/ Upstream Author is Kees Cook -Copyright (C) 2000-2004 Kees Cook +Copyright (C) 2000-2009 Kees Cook License: diff -u sendpage-1.0.3/debian/changelog sendpage-1.0.3/debian/changelog --- sendpage-1.0.3/debian/changelog +++ sendpage-1.0.3/debian/changelog @@ -1,14 +1,16 @@ -sendpage (1.0.3-0ubuntu1) intrepid; urgency=low +sendpage (1.0.3-1) unstable; urgency=low * New upstream release (Closes: #458951). * debian/control: - take over maintainership with permission from prior maintainer. - add new libdbi-perl dependency. - - bump Standards-Version to 3.8.0: + - bump Standards-Version to 3.8.1: - update Source-Version to binary:Version. - add Homepage field. - move mta to Suggests, switch to postfix from exim4. - move Depends around to reduce redundancy. + - add Vcs-* fields. + - add debian/README.source for quilt. * debian/rules: - general clean-ups, dh 6 capabilities. - switch to using .install files. @@ -16,6 +18,7 @@ * debian/sendpage.init: - switch to using LSB log messages. - support "status" command. + - handle unconfigured modems during init (LP: #62807). * sendpage: - have status return sane exit code, based on running daemons. - fix up defaults to run correctly on Debian (user "sendpage", groups @@ -25,7 +28,7 @@ isolated "sendpage" user (Closes: #313646). * sendmail2snpp: replace with safer shell version with same functionality. - -- Kees Cook Sat, 16 Aug 2008 09:02:54 -0700 + -- Kees Cook Tue, 19 May 2009 07:08:10 -0700 sendpage (0.9.14.dfsg-0.2) unstable; urgency=low diff -u sendpage-1.0.3/debian/control sendpage-1.0.3/debian/control --- sendpage-1.0.3/debian/control +++ sendpage-1.0.3/debian/control @@ -1,12 +1,13 @@ Source: sendpage Section: comm Priority: extra -Maintainer: Kees Cook -XSBC-Original-Maintainer: Kees Cook +Maintainer: Kees Cook Build-Depends: debhelper (>= 6.0.0), quilt Build-Depends-Indep: perl (>= 5.6.1-6), libdevice-serialport-perl (>= 1.04), libmailtools-perl (>= 1.40), libnet-perl, libnet-snpp-perl, libdbi-perl -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://sendpage.org/ +Vcs-Svn: https://sendpage.svn.sourceforge.net/svnroot/sendpage +Vcs-Browser: http://sendpage.svn.sourceforge.net/viewvc/sendpage/sendpage/ Package: sendpage-server Architecture: all @@ -37,8 +38,8 @@ Package: sendpage-common Architecture: all -Depends: ${misc:Pre-Depends}, ${perl:Depends}, libdevice-serialport-perl (>= 1.04), libmailtools-perl (>= 1.40-1), libnet-perl, libnet-snpp-perl, libdbi-perl -Description: common libraries used to handle alpha-numeric text pagings +Depends: ${misc:Pre-Depends}, ${misc:Depends}, ${perl:Depends}, libdevice-serialport-perl (>= 1.04), libmailtools-perl (>= 1.40-1), libnet-perl, libnet-snpp-perl, libdbi-perl +Description: common libraries used to handle alpha-numeric text paging To send alphanumeric pages to a pager, if an email gateway is unavailable or undesirable, software is needed to control a modem which will dial a Paging Central, and deliver the pages using an ASCII delivery system known diff -u sendpage-1.0.3/debian/rules sendpage-1.0.3/debian/rules --- sendpage-1.0.3/debian/rules +++ sendpage-1.0.3/debian/rules @@ -10,7 +10,7 @@ DESTDIR=$(CURDIR)/debian/tmp -build: patch build-stamp +build: $(QUILT_STAMPFN) build-stamp build-stamp: dh_testdir @@ -19,8 +19,8 @@ touch build-stamp -clean: unpatch clean-unpatched -clean-unpatched: +clean: clean-patched unpatch +clean-patched: dh_testdir dh_testroot dh_clean @@ -69 +69 @@ -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install configure clean-patched only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendpage-client.docs +++ sendpage-1.0.3/debian/sendpage-client.docs @@ -0,0 +1,2 @@ +README +TODO only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendmail2snpp +++ sendpage-1.0.3/debian/sendmail2snpp @@ -0,0 +1,38 @@ +#!/usr/bin/perl + +eval 'exec /usr/bin/perl -S $0 ${1+"$@"}' + if 0; # not running under some shell +# +# quick script for sending pages through sendmail +# +# $Id: sendmail2snpp,v 1.3 2001/03/01 21:43:20 nemies Exp $ +# +# Copyright (C) 2000,2001 Kees Cook +# cook@cpoint.net, http://outflux.net/ +# +# 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 2 +# of the License, 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# http://www.gnu.org/copyleft/gpl.html + +# to tee off the pages, use this: +#$cmd="tee /tmp/page.$$ | email2page | snpp ".join(" ",@ARGV); +$cmd="email2page | snpp ".join(" ",@ARGV); +system($cmd); +exit ($?>>8); + +# +# This is really the same as a shell script doing the following: +# +# email2page | snpp "$@" +# only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendpage.cf.example +++ sendpage-1.0.3/debian/sendpage.cf.example @@ -0,0 +1,468 @@ +############################################################################## +# sendpage.cf # +############################################################################## +# +# There are four majors sections: +# - global Any global settings +# - "modem" Each modem's settings +# - "pc" Each Paging Central's settings +# - "recip" Each recipient name's settings +# +# Except for global, each section starts with the section name in +# []'s. So, to define a modem named "sportster", the section name +# would be "[modem:sportster]", and all of the sportster's settings +# would follow. +# +# section names cannot have "=", "@", or ":" in their text. +# +# For each major section, I go through all the default values +# and their variable names. If you don't like a default value, +# just comment in the variable name, and change the value to something +# else. +# + + + +############################# +# global section +############################# +# queue & manager-level debugging. Default is "false" +# +#debug=true + +# select-loop debugging. Default is "false" +# Leave this as it is unless you're digging around in the select +# loop code. It is VERY annoying. :) +# +#debug-select=true + +# SNPP activity debugging. Default is "false" +# +#debug-snpp=true + +# alias-expansion debugging. Default is "false" +# +#alias-debug=true + +# Filename prefix for writing process ID files. +# Default is "/var/spool/sendpage/sendpage" +# +#pidfileprefix = /tmp/var/spool/sendpage/sendpage + +# Filename prefix for writing UUCP-style device locks. +# Default is "/var/lock/LCK.." +# +#lockprefix = /tmp/var/lock/LCK.. + +# Directory to store Paging Central pager queues +# Default is "/var/spool/sendpage" +# +queuedir = /var/spool/sendpage + +# Username that sendpage should be running as. +# Default is "sendpage" +user = daemon + +# Group sendpage needs to lock devices. +# Default is "uucp" +group-lock=dialout + +# Group sendpage needs to read/write devices. +# Default is "tty" +#group-tty=users + +# Email address that page emails claims to be coming from. +# Default is "sendpage" +# +#page-daemon = nemesis@outflux.net + +# Will page-daemon be Cc'd on email failures? +# Default is "true" +cc-on-error = false + +# By which mechanism should email be delivered? mail, sendmail, or SMTP? +# Default is "sendmail" +mail-agent = sendmail + +# Should page senders be notified about permanent failures? +# Default is "true" +#fail-notify = false + +# Page senders should be notified every Xth temporary failure. +# (0 means 'never') +# Default is "5". +#tempfail-notify-after=10 + +# How many times does a page hit a temporary error before failing forever? +# Default is "20" +#max-tempfail=50 + +# Should syslog be used instead of STDERR for logging? +# Default is "true" +#syslog=false + +# When using syslog, which syslog options should be used? +# (any of "pid", "ndelay", "cons", or "nowait") +# Default is "pid" +#syslog-opt= pid, cons + +# Which syslog facility should be used? man syslog for more info +# Default is "local6" +#syslog-facility=local4 + +# What port sendpage binds to for the SNPP server. +# Default is "444" +#snpp-port=3044 + +# What local address sendpage binds the SNPP server to. +# *NOTE* +# You should set this to "0.0.0.0" if you want to receive pages from +# the rest of the world. +# +# You can use this to limit which IP address SNPP is bound to. +# *NOTE* +# +# Default is "localhost" +#snpp-addr=0.0.0.0 + +# What to do about incoming SNPP requests (multiple entries allowed) +# *NOTE* +# You should set this to "0.0.0.0/0.0.0.0:ALLOW" if you want +# anyone to connect to your SNPP server. +# *NOTE* +# +# Format is "NET/MASK:WAY" where WAY is either "ALLOW" or "DENY" +# +# ACL processing is done top to bottom, and if no match occurs, +# the connection is rejected. +# +# Default is "127.0.0.1/255.255.255.255:ALLOW" +#snpp-acl="128.174.5.0/255.255.255.0:ALLOW" +#snpp-acl="128.23.1.10/255.255.255.255:DENY" +#snpp-acl="128.23.1.0/255.255.255.0:ALLOW" + +# List of modems a PC should use if not told explicitly. +# Default is all available modems. +# +#modems = sportster + +# Default domain for email-cc (not implemented yet) +#fallback-email-domain = @cpoint.net + +# Command to run after each successful or failed page +# Default is unset +# Command gets contents of page on stdin, and 2 command line +# parameters: +# arg 1: status (0=page failed, 1=page succeeded) +# arg 2: page alias (who was paged) +# +#completion-cmd = "/usr/local/bin/page-sent" + +###################### +# modem configuration +# Each section should be called "modem". (e.g. "[modem:sportster]") +###################### + +# My first "modem" section. I named it "sportster" because that's what it is +[modem:sportster] +# Should this modem's character-level debugging be turned on? +# Default is "false" +#debug = true + +# This modem's transmission settings. +# Defaults are data=7, parity=even, stop=1, flow=rts, baud=9600 +#data = 8 +#parity = none +#stop = 1 +#flow = soft +#baud = 38400 + +# Which device this modem should use +# Default is "/dev/null", so you better specify one. :) +dev = /dev/ttyS0 + +# This modem's initialization string +# Default is "ATZ" +#init = ATE&1 + +# This modem's "okay" response string (this is a regexp) +# Default is "OK" +#initok = 0 + +# What to look for if something has gone wrong while init'ing (this is a regexp) +# Default is "ERROR" +#error=1 + +# How many seconds to wait for initok after init with this modem +# Default is "4" +#initwait=1 + +# How many times to try to initialize the modem +# Default is "2" +#initretries=1 + +# The dialing prefix for this modem +# Default is "ATDT" +#dial=ATDP + +# The telephone prefix to get a dialtone out of the building (for PBXs, etc) +# Default is "" +#dialout="9," + +# The areacode this modem has (for figuring areacode matches with PCs) +# Default is unset +#areacode="847" + +# The dialing prefix for dialing long distance calls (some PBXs do weird stuff) +# Default is "1-" +#longdist="81" + +# What to look for after connecting successfully (this is a regexp) +# Default is "CONNECT.*\r" +#dialok=0 + +# What to look for if something goes wrong while dialing (this is a regexp) +# Default is "ERROR|NO CARRIER|BUSY|NO DIAL|VOICE" +#no-carrier=ERROR + +# How many seconds to wait for dialing to connect +# Default is "60" +#dialwait=30 + +# How many times to try and redial (unimplemented, actually...) +# Default is "3" +#dialretries=1 + +# How should "carrier detection" be done? "on", "off", "dsr" +# "DSR" can be used when a cable or OS doesn't correctly provide CD +# Default is "on" +#carrier-detect=dsr + +# How many seconds should the DTR be held down during initialization? +# Default is "0.5" +#dtrtime=1.5 + + +## As an example, this is what a directly attached paging terminal +## might look like: +## +#[modem:direct] +#carrier-detect=off +#dtrtime=0 +#init="" +#initok="" +#dial="" +#dialok="" +#dev=/dev/serial + + +######################### +# Paging central section +# each section should be called "pc" (e.g. "[pc:ameritech]") +######################### +# I have an ameritech pager. It actually works in the entire state, +# so I should dig up the Champaign/Urbana PC info. For now, this is the +# chicago access number +[pc:ameritech] +# Is this PC enabled? Set to false to stop processing a PC, for example +# Default is "true" +#enabled= false + +# This PC's protocol-level debugging. +# Default is "false" +#debug = true + +# Email address that page emails claims to be coming from. +# Default is unset, and will fall back to the global "page-daemon" setting +# +#page-daemon = someone@other.place + +# Will page-daemon be Cc'd on email failures for this PC? +# Default is unset, and will fall back to global "cc-on-error" setting +#cc-on-error = true + +# Should page senders be notified about permanent failures? +# Default is unset; will fall back to global option +#fail-notify = false + +# Page senders should be notified every Xth temporary failure. +# (0 means 'never') +# Default is unset; will fall back to global option +#tempfail-notify-after=10 + +# How many times does a page hit a temporary error before failing forever? +# Default is unset; will fall back to global option +#max-tempfail=50 + +# Command to run after each successful or failed page, overrides global +# Default is unset +# Command gets contents of page on stdin, and 2 command line +# parameters: +# arg 1: status (0=page failed, 1=page succeeded) +# arg 2: page alias (who was paged) +# +#completion-cmd = "/usr/local/bin/page-sent" + +# If for some reason you need to override the default list of modems, +# do it here. +# Default is all available modems. +#modems = sportster + +# If you need specific communication settings for this PC, they go here. +# Defaults are data=7, parity=even, stop=1, flow=rts, baud=115200 +#data = 8 +#parity = none +#stop = 1 +#flow = soft +#baud = 9600 + +# What areacode is this PC in? If unset, the modem won't match areacodes +# Default is unset +areacode= 312 + +# What phone number to reach this PC at. +# Default is "", so you better fill one in +phonenum= 5149243 + +# How many pages can be sent in each session with this PC? +# Default is 0 (unlimited) +#maxpages=12 + +# How many blocks can be sent in each session with this PC? +# Default is 0 (unlimited) +#maxblocks=60 + +# How many characters can be sent in each page for this PC? +# Default is 1024 +maxchars=300 + +# How many times are we allowed to split up a page that exceeds the +# max chars limit? (For example, if maxchars was "100" and maxsplits was +# "5" and someone sent a 2000 character page, sendpage would generate +# five 100-character pages before cutting off the page.) +# Default is "6" +#maxsplits=2 + +# Which TAP protocol to use. Should be either "PG1" or "PG3". Most are "PG1". +# If you had a "pet3" style PC before, this needs to be "PG3" +# Default is "PG1" +#proto=PG3 + +# How many fields does the PC expect to be getting during Block Transmission? +# If you had a "pet3" style PC before, this needs to be "3". +# Default is "2" +#fields=3 + +# What is the password for accessing this Paging Central? +# Default is "000000". Shouldn't be more than 6 characters. +#password=123456 + +# Should we assume strict TAP protocol, and require CR before each answer? +# If you can set this to true, do so, as it makes textual response codes +# easier to read. However, very few PCs use those codes, and very few +# PCs have correctly implemented strict TAP, so it's unlikely you want this. +# Default is "false" +#stricttap=true + +# Characters less than 0x20 are allowed in a block's field? +# If you can set this, it makes pages prettier (can send tabs, newlines, +# etc), but some PCs really don't like this. See 'esc' and 'lfok' options. +# Default is "false" +#ctrl=true + +# Can characters less than 0x20 be escaped, as in TAP spec 1.8? +# If you can't set "ctrl" to true, see if this one set to true works. +# Default is "false" +#esc=true + +# Is LF explicitly allowed by this PC? (only useful if "ctrl=false") +# Default is "false" +#lfok=true + +# Can fields be split across blocks? +# Default is "true" +#fieldsplits=false + +# How many seconds to wait before sending CR when waiting for the ID= tag? +# Default is "2", from the T1 of the TAP protocol +#answerwait=10 + +# How many retries to allow before giving up waiting for the ID= tag? +# Default is "3", from the N3 of the TAP protocol +#answerretries=3 + +# How many seconds before we giving up trying to dial this PC? +# Default is whatever the modem's dialwait is +#dialwait=20 + +# How many seconds should this PC wait between queue scans? +# Default is "20" +#rundelay=10 + + +# I have a skytel that only works in Illinois, and I've only called this +# number from chicago, but I think it's valid as a national TAP access +# number. +[pc:skytel] +areacode=800 +phonenum=7596366 +stricttap=true + +# I have a nextel that should work Nationally, but I've only called this +# number from Chicago, while I was IN Chicago with the NexTel. +[pc:nextel] +areacode=312 +phonenum=9076683 +stricttap=true + +# This is the BellSouth RIM pager +[pc:rim-pager] +areacode=800 +phonenum=868-2835 +stricttap=true + + +################### +# Recipients +# This section starts with "recip". (e.g. "[recip:cook]") +# Sorry this section is so clunky... +# +# 'email-cc' will get passed down to an expanding alias. For +# example, look at the "[recip:cook]" below. I have an email-cc, +# and it'll stick with the recip alias, even though it finally +# expands the "dest" to be "cook_ameritech". Did that make any sense? +# +# dest: Where to send the page. Either PIN@paging-central, or +# another recip name. +# email-cc: Where to send an email CC of the page +# +################### + +# My three pagers +[recip:cook_ameritech] +dest = 1234567@ameritech +[recip:cook_nextel] +dest = 1234567@nextel +[recip:cook_skytel] +dest = 1234567@skytel +[recip:cook] +dest = cook_ameritech +email-cc= cook@cpoint.net + +# Paul's nextel +[recip:pholcomb] +dest = 1234567@nextel + +# Kirsten's ameritech pager +[recip:kirsten] +dest = 1234567@ameritech +email-cc= dragon@blight.com + +# Christian's RIM pager +[recip:cvoid] +dest = 1234567@rim-pager + +# A group alias for Paul and me +[recip:oncall] +dest = cook, pholcomb +email-cc= cpoint@cpoint.net only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendpage-client.dirs +++ sendpage-1.0.3/debian/sendpage-client.dirs @@ -0,0 +1,2 @@ +usr/bin +etc/sendpage only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendpage-server.docs +++ sendpage-1.0.3/debian/sendpage-server.docs @@ -0,0 +1,2 @@ +README +TODO only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/sendpage-common.prerm +++ sendpage-1.0.3/debian/sendpage-common.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/sendpage-common ]; then + rm -f /usr/doc/sendpage-common +fi + +#DEBHELPER# only in patch2: unchanged: --- sendpage-1.0.3.orig/debian/README.source +++ sendpage-1.0.3/debian/README.source @@ -0,0 +1,57 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To configure quilt to use debian/patches instead of patches, you want +either to export QUILT_PATCHES=debian/patches in your environment +or use this snippet in your ~/.quiltrc: + + for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do + if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then + export QUILT_PATCHES=debian/patches + fi + done + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run: + + quilt push -a + +The last patch listed in debian/patches/series will become the current +patch. + +To add a new set of changes, first run quilt push -a, and then run: + + quilt new + +where is a descriptive name for the patch, used as the filename in +debian/patches. Then, for every file that will be modified by this patch, +run: + + quilt add + +before editing those files. You must tell quilt with quilt add what files +will be part of the patch before making changes or quilt will not work +properly. After editing the files, run: + + quilt refresh + +to save the results as a patch. + +Alternately, if you already have an external patch and you just want to +add it to the build system, run quilt push -a and then: + + quilt import -P /path/to/patch + quilt push -a + +(add -p 0 to quilt import if needed). as above is the filename to +use in debian/patches. The last quilt push -a will apply the patch to +make sure it works properly. + +To remove an existing patch from the list of patches that will be applied, +run: + + quilt delete + +You may need to run quilt pop -a to unapply patches first before running +this command.