[Popcon-commits] cvs commit to popularity-contest/debian by pere
popcon-commits@lists.alioth.debian.org
popcon-commits@lists.alioth.debian.org
Sat, 02 Jul 2005 17:18:08 +0000
Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv3864/debian
Modified Files:
changelog control cron.weekly rules
Log Message:
* Add support for reporting using http POST.
* new script /usr/share/popularity-contest/popcon-upload
* new CGI /usr/share/doc/popularity-contest/popcon.cgi
* Uploading using content-type text/plain, content-encoding x-gzip.
* debian/cron.weekly:
- do not run sendmail if it is not available. This will make it
possible to downgrade mail-transport-agent from Depend to
Recommends if we move to HTTP.
- try to run /usr/share/popularity-contest/popcon-upload if
USEHTTP is enabled, disabled by default.
* Code done by Bill Allombert. Patch based on code from Ubuntu,
though reimplemented in perl to avoid python dependency. The
ubuntu versions are included in the source package as
popcon-submit-ubuntu.cgi and popcon-upload-ubuntu.
* Added simple FAQ entry about the http POST feature.
* Depend on ${misc:Depends} instead of debconf, to get the updated
debconf dependency.
* TODO:
+ Edit popcon-submit.cgi to report to the main server
+ Add timeout in the upload script.
+ Consider using existing perl module to submit file using http.
Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- changelog 7 Jun 2005 15:15:08 -0000 1.189
+++ changelog 2 Jul 2005 17:18:06 -0000 1.190
@@ -1,3 +1,29 @@
+popularity-contest (1.30) UNRELEASED; urgency=low
+
+ * Add support for reporting using http POST.
+ * new script /usr/share/popularity-contest/popcon-upload
+ * new CGI /usr/share/doc/popularity-contest/popcon.cgi
+ * Uploading using content-type text/plain, content-encoding x-gzip.
+ * debian/cron.weekly:
+ - do not run sendmail if it is not available. This will make it
+ possible to downgrade mail-transport-agent from Depend to
+ Recommends if we move to HTTP.
+ - try to run /usr/share/popularity-contest/popcon-upload if
+ USEHTTP is enabled, disabled by default.
+ * Code done by Bill Allombert. Patch based on code from Ubuntu,
+ though reimplemented in perl to avoid python dependency. The
+ ubuntu versions are included in the source package as
+ popcon-submit-ubuntu.cgi and popcon-upload-ubuntu.
+ * Added simple FAQ entry about the http POST feature.
+ * Depend on ${misc:Depends} instead of debconf, to get the updated
+ debconf dependency.
+ * TODO:
+ + Edit popcon-submit.cgi to report to the main server
+ + Add timeout in the upload script.
+ + Consider using existing perl module to submit file using http.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 2 Jul 2005 16:58:28 +0200
+
popularity-contest (1.29) unstable; urgency=low
* Please note when reading stats that sarge was released with 1.28.
Index: control
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/control,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- control 19 Nov 2004 14:03:43 -0000 1.10
+++ control 2 Jul 2005 17:18:06 -0000 1.11
@@ -8,7 +8,7 @@
Package: popularity-contest
Architecture: all
-Depends: dpkg (>= 1.10), exim4 | mail-transport-agent, debconf, ${perl:Depends}
+Depends: ${misc:Depends}, dpkg (>= 1.10), exim4 | mail-transport-agent, ${perl:Depends}
Recommends: cron
Suggests: anacron
Provides: popcon
Index: cron.weekly
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/cron.weekly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cron.weekly 10 Feb 2004 11:36:46 -0000 1.4
+++ cron.weekly 2 Jul 2005 17:18:06 -0000 1.5
@@ -9,6 +9,8 @@
unset MAILTO
unset MY_HOSTID
unset PARTICIPATE
+unset SUBMITURL
+unset USEHTTP
# get configuration information
. /usr/share/popularity-contest/default.conf
@@ -24,6 +26,7 @@
cd /var/log
umask 022
savelog -c 7 popularity-contest >/dev/null
+POPCON=/var/log/popularity-contest
run_popcon()
{
@@ -47,8 +50,18 @@
fi
}
-# generate and transmit the popularity contest data
+# generate the popularity contest data
-run_popcon \
- | tee /var/log/popularity-contest \
- | do_sendmail
+run_popcon > $POPCON
+
+# try to email the popularity contest data
+
+if [ -x "`which sendmail 2>/dev/null`" ]; then
+ do_sendmail < $POPCON
+fi
+
+# try to post the report through http POST
+if [ "$SUBMITURL" ] && [ "yes" = "$USEHTTP" ]; then
+ setsid /usr/share/popularity-contest/popcon-upload \
+ -u $SUBMITURL -f $POPCON 2>/dev/null
+fi
Index: rules
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/rules,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rules 7 Jun 2005 12:26:57 -0000 1.13
+++ rules 2 Jul 2005 17:18:06 -0000 1.14
@@ -26,6 +26,7 @@
install -d debian/tmp/etc/
install -d debian/tmp/usr/share/popularity-contest/
install popularity-contest debian/tmp/usr/sbin/
+ install popcon-upload debian/tmp/usr/share/popularity-contest/
install popcon-largest-unused debian/tmp/usr/sbin/
install -m 644 default.conf debian/tmp/usr/share/popularity-contest/
@@ -34,7 +35,7 @@
dh_testdir
dh_testroot
dh_installdocs README FAQ
- dh_installexamples prepop.pl popcon-process.sh popanal.py popcon.pl popcon-stat.pl README.examples
+ dh_installexamples prepop.pl popcon-process.sh popanal.py popcon.pl popcon-stat.pl popcon-submit.cgi README.examples
dh_installmenu
dh_installcron
dh_installman debian/popularity-contest.8 debian/popcon-largest-unused.8