r57125 - in /branches/lenny/libmediawiki-perl: debian/changelog debian/control debian/patches/ debian/rules lib/MediaWiki.pm

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Thu Apr 29 14:32:46 UTC 2010


Author: ansgar-guest
Date: Thu Apr 29 14:32:32 2010
New Revision: 57125

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57125
Log:
Patch files directly instead of using quilt as requested by RM

Removed:
    branches/lenny/libmediawiki-perl/debian/patches/
Modified:
    branches/lenny/libmediawiki-perl/debian/changelog
    branches/lenny/libmediawiki-perl/debian/control
    branches/lenny/libmediawiki-perl/debian/rules
    branches/lenny/libmediawiki-perl/lib/MediaWiki.pm

Modified: branches/lenny/libmediawiki-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libmediawiki-perl/debian/changelog?rev=57125&op=diff
==============================================================================
--- branches/lenny/libmediawiki-perl/debian/changelog (original)
+++ branches/lenny/libmediawiki-perl/debian/changelog Thu Apr 29 14:32:32 2010
@@ -3,11 +3,10 @@
   TODO: Wait for ack from release team (#579608).
 
   * Add support for login token. (Closes: #578691)
-  * Use quilt to manage patches.
   * Remove David Paleino from Uploaders (as in 1.13-1.1).
   * Add myself to Uploaders.
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Tue, 27 Apr 2010 20:17:57 +0900
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Thu, 29 Apr 2010 22:39:06 +0900
 
 libmediawiki-perl (1.13-1) unstable; urgency=low
 

Modified: branches/lenny/libmediawiki-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libmediawiki-perl/debian/control?rev=57125&op=diff
==============================================================================
--- branches/lenny/libmediawiki-perl/debian/control (original)
+++ branches/lenny/libmediawiki-perl/debian/control Thu Apr 29 14:32:32 2010
@@ -1,7 +1,7 @@
 Source: libmediawiki-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0), quilt (>= 0.45-1)
+Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: perl (>= 5.8.8-7), libwww-perl, libconfig-inihash-perl,
  libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>

Modified: branches/lenny/libmediawiki-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libmediawiki-perl/debian/rules?rev=57125&op=diff
==============================================================================
--- branches/lenny/libmediawiki-perl/debian/rules (original)
+++ branches/lenny/libmediawiki-perl/debian/rules Thu Apr 29 14:32:32 2010
@@ -11,8 +11,6 @@
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
 
-include /usr/share/quilt/quilt.make
-
 PACKAGE=$(shell dh_listpackages)
 
 ifndef PERL
@@ -22,7 +20,7 @@
 TMP     =$(CURDIR)/debian/$(PACKAGE)
 
 build: build-stamp
-build-stamp: $(QUILT_STAMPFN)
+build-stamp:
 	dh_testdir
 
 	$(PERL) Makefile.PL \
@@ -41,7 +39,7 @@
 
 	touch $@
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	dh_clean build-stamp install-stamp

Modified: branches/lenny/libmediawiki-perl/lib/MediaWiki.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/lenny/libmediawiki-perl/lib/MediaWiki.pm?rev=57125&op=diff
==============================================================================
--- branches/lenny/libmediawiki-perl/lib/MediaWiki.pm (original)
+++ branches/lenny/libmediawiki-perl/lib/MediaWiki.pm Thu Apr 29 14:32:32 2010
@@ -207,10 +207,17 @@
 		return 1;
 	}
 
+	# get login token
+	my $token_res = $mw->{ua}->request(GET $mw->{index} . "?title=Special:Userlogin");
+	return $mw->error(ERR_LOGIN_FAILED) unless $token_res->is_success;
+
+	my $token;
+	$token = $1 if $token_res->content() =~ /input type=['"]hidden['"] name=['"]wpLoginToken['"] value=['"]([a-fA-F0-9]+)['"]/i;
+
 	my $res = $mw->{ua}->request(
 		POST $mw->{index} . "?title=Special:Userlogin&action=submitlogin",
 		Content_Type  => 'application/x-www-form-urlencoded',
-		Content       => [ ( 'wpName' => $user, 'wpPassword' => $pass, 'wpLoginattempt' => 'Log in' ) ]
+		Content       => [ ( 'wpName' => $user, 'wpPassword' => $pass, 'wpLoginattempt' => 'Log in' ), defined $token ? (wpLoginToken => $token) : () ]
 	);
 	if($res->code == 302 || $res->header("Set-Cookie"))
 	{




More information about the Pkg-perl-cvs-commits mailing list