rpms/p0rn-comfort/devel p0rn-comfort.spec, NONE, 1.1 p0rn-modules.patch, NONE, 1.1 p0rn-paths.patch, NONE, 1.1 p0rn-static.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Andreas Thienemann (ixs)
fedora-extras-commits at redhat.com
Mon May 22 20:24:29 UTC 2006
Author: ixs
Update of /cvs/extras/rpms/p0rn-comfort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19508/devel
Modified Files:
.cvsignore sources
Added Files:
p0rn-comfort.spec p0rn-modules.patch p0rn-paths.patch
p0rn-static.patch
Log Message:
auto-import p0rn-comfort-0.0.4-2 on branch devel from p0rn-comfort-0.0.4-2.src.rpm
--- NEW FILE p0rn-comfort.spec ---
Name: p0rn-comfort
Version: 0.0.4
Release: 2%{?dist}
Summary: Support programs for browsing image-gallery sites
License: GPL
Group: Applications/Internet
URL: http://www.cgarbs.de/p0rn-comfort.en.html
Source0: http://www.cgarbs.de/stuff/p0rn-comfort-%{version}.tar.gz
Patch0: p0rn-modules.patch
Patch1: p0rn-static.patch
Patch2: p0rn-paths.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: lynx, wget, mmv
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Provides: perl(P0rn::DB), perl(P0rn::Static)
%description
p0rn-comfort consists of several support programs for browsing
image-gallery sites. It includes a proxy which enables blacklisting
of thumbnail sites on-the-fly. It also supports queueing of entire
pages for download and fetching them at a later time. Queuing can
either be done manually (directly from your browser) or by an
automated download script which can also follow links between
different galleries.
%prep
%setup -q
%patch0 -p 1 -b .modules
%patch1 -p 1 -b .static
%patch2 -p 1 -b .paths
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{perl_vendorlib}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_libexecdir}/p0rn-comfort
mkdir -p %{buildroot}%{_mandir}/man1
install -m 644 -D P0rn/DB.pm %{buildroot}%{perl_vendorlib}/P0rn/DB.pm
install -m 644 -D P0rn/Static.pm %{buildroot}%{perl_vendorlib}/P0rn/Static.pm
install -m 755 p0rn-bot p0rn-dbdump p0rn-dbrestore p0rn-download p0rn-grab \
p0rn-proxy \
%{buildroot}%{_bindir}
install -m 755 p0rn-dbadd p0rn-dbdel p0rn-dblist \
%{buildroot}%{_libexecdir}/p0rn-comfort
# Create and install man-pages
#for file in p0rn-bot p0rn-dbadd p0rn-dbdel p0rn-dblist p0rn-download; do
# perldoc -d %{buildroot}%{_mandir}/man1/$file.1 $file
#done
#chmod 644 %{buildroot}%{_mandir}/man1/*
for file in $(cd docs; ls *.1); do
install -m 644 docs/$file %{buildroot}%{_mandir}/man1/$file
done
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYRIGHT README
%{_bindir}/*
%{_libexecdir}/p0rn-comfort/*
%{perl_vendorlib}/*
%{_mandir}/man1/*
%changelog
* Sun May 21 2006 Andreas Thienemann <andreas at bawue.net> 0.0.4-2
- Modified p0rn-proxy to actually access P0rn::Static
- Install some binaries into %%{_libexecdir}
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.0.4-1
- Cleaned up for FE
p0rn-modules.patch:
--- NEW FILE p0rn-modules.patch ---
# This Patch fixes the Package-Name and adds a
# better path for the p0rn Database
--- p0rn-comfort-0.0.4/P0rn/Static.pm.orig 2006-04-28 01:22:36.000000000 +0200
+++ p0rn-comfort-0.0.4/P0rn/Static.pm 2006-04-28 01:23:48.000000000 +0200
@@ -7,7 +7,7 @@
use strict;
-package Static;
+package P0rn;
our $PROXY_ADMIN = 'admin';
our $PROXY_CTRL_BASE = 'http://www.cgarbs.de/PROXYCONTROL';
--- p0rn-comfort-0.0.4/P0rn/DB.pm.orig 2006-04-28 01:22:32.000000000 +0200
+++ p0rn-comfort-0.0.4/P0rn/DB.pm 2006-04-28 01:22:56.000000000 +0200
@@ -7,7 +7,7 @@
use DBM::Deep;
-my $dblocation = './p0rn.db';
+my $dblocation = $ENV{HOME}.'/.p0rn.db';
$dblocation = $ENV{P0RNDBLOCATION} if exists $ENV{P0RNDBLOCATION};
my $db = new DBM::Deep(
p0rn-paths.patch:
--- NEW FILE p0rn-paths.patch ---
--- p0rn-comfort-0.0.4/p0rn-dbrestore.orig 2006-05-22 22:11:20.000000000 +0200
+++ p0rn-comfort-0.0.4/p0rn-dbrestore 2006-05-22 22:11:51.000000000 +0200
@@ -22,10 +22,10 @@
}
print "clearing table $table\n";
- system("p0rn-dblist $table | p0rn-dbdel $table");
+ system("/usr/libexec/p0rn-comfort/p0rn-dblist $table | /usr/libexec/p0rn-comfort/p0rn-dbdel $table");
print "loading table $table\n";
- open LOAD, "| p0rn-dbadd $table" or die "can't open pipe: $!\n";
+ open LOAD, "| /usr/libexec/p0rn-comfort/p0rn-dbadd $table" or die "can't open pipe: $!\n";
$db_open = 1;
} else {
--- p0rn-comfort-0.0.4/p0rn-dbdump.orig 2006-05-22 22:12:15.000000000 +0200
+++ p0rn-comfort-0.0.4/p0rn-dbdump 2006-05-22 22:13:00.000000000 +0200
@@ -9,6 +9,6 @@
for TABLE in thumbz picz downz; do
echo dumping table $TABLE 1>&2
echo "?${TABLE}&"
- p0rn-dblist -v ${TABLE}
+ /usr/libexec/p0rn-comfort/p0rn-dblist -v ${TABLE}
done
echo finished 1>&2
p0rn-static.patch:
--- NEW FILE p0rn-static.patch ---
--- p0rn-comfort-0.0.4/p0rn-proxy.orig 2006-05-21 20:12:32.000000000 +0200
+++ p0rn-comfort-0.0.4/p0rn-proxy 2006-05-21 20:12:35.000000000 +0200
@@ -177,7 +177,7 @@
#
my $CVSVERSION = do { my @r = (q$Revision: 1.26 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
-my $URLBASE = $Static::PROXY_CTRL_BASE;
+my $URLBASE = $P0rn::Static::PROXY_CTRL_BASE;
my ($ua, $thumbs, $pics, $downs);
my @downs = ( 'queued', 'running', 'finished' );
@@ -207,35 +207,35 @@
my $uri = $2;
my $urishort = shorten_uri($uri);
- if ($cmd eq ${Static::PROXY_MARK_THUMB} ) {
+ if ($cmd eq ${P0rn::Static::PROXY_MARK_THUMB} ) {
$thumbs->{$urishort} = 0;
$content .= "<a href=\"$uri\">$urishort</a> has been marked as a thumbnail page.";
$response->header(refresh => '5; url=javascript:window.close()');
- } elsif ($cmd eq ${Static::PROXY_SINGLE_THUMB} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_THUMB} ) {
$thumbs->{$urishort} = 1;
$content .= "<a href=\"$uri\">$urishort</a> (thumbnail) can now be accessed once.";
$response->header(refresh => "1; $uri");
- } elsif ($cmd eq ${Static::PROXY_UNMARK_THUMB} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_THUMB} ) {
delete $thumbs->{$urishort};
$content .= "<a href=\"$uri\">$urishort</a> has been removed from the thumbnail list.";
- } elsif ($cmd eq ${Static::PROXY_MARK_PICTURE} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_PICTURE} ) {
$pics->{$urishort} = 0;
$content .= "<a href=\"$uri\">$urishort</a> has been marked as a picture page.";
$response->header(refresh => '5; url=javascript:window.close()');
- } elsif ($cmd eq ${Static::PROXY_SINGLE_PICTURE} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_SINGLE_PICTURE} ) {
$pics->{$urishort} = 1;
$content .= "<a href=\"$uri\">$urishort</a> (picture) can now be accessed once.";
$response->header(refresh => "1; $uri");
- } elsif ($cmd eq ${Static::PROXY_UNMARK_PICTURE} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_PICTURE} ) {
delete $pics->{$urishort};
$content .= "<a href=\"$uri\">$urishort</a> has been removed from the picture list.";
- } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) {
$pics->{$urishort} = 0;
$content .= "<a href=\"$uri\">$urishort</a> has been marked as a picture page.<br>";
if (exists $downs->{$urishort}) {
@@ -246,59 +246,59 @@
}
$response->header(refresh => '5; url=javascript:window.close()');
- } elsif ($cmd eq ${Static::PROXY_UNMARK_DOWNLOAD} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_UNMARK_DOWNLOAD} ) {
delete $downs->{$urishort};
$content .= "<a href=\"$uri\">$urishort</a> has been removed from the download list";
- } elsif ($cmd eq ${Static::PROXY_MARK_DOWNLOAD} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_MARK_DOWNLOAD} ) {
$content .= '<h1>p0rn-proxy main menu</h1><ul><ul><ul>' .
- "<li><a href=\"$URLBASE/${Static::PROXY_LIST_THUMB}/_nouri_\">list thumbnail pages</a></li>" .
- "<li><a href=\"$URLBASE/${Static::PROXY_LIST_PICTURE}/_nouri_\">list picture pages</a></li>" .
- "<li><a href=\"$URLBASE/${Static::PROXY_LIST_DOWNLOAD}/_nouri_\">list download pages</a></li>" .
- "</ul></ul><hr>p0rn-proxy ${Static::VERSION}/$CVSVERSION</ul>";
+ "<li><a href=\"$URLBASE/${P0rn::Static::PROXY_LIST_THUMB}/_nouri_\">list thumbnail pages</a></li>" .
+ "<li><a href=\"$URLBASE/${P0rn::Static::PROXY_LIST_PICTURE}/_nouri_\">list picture pages</a></li>" .
+ "<li><a href=\"$URLBASE/${P0rn::Static::PROXY_LIST_DOWNLOAD}/_nouri_\">list download pages</a></li>" .
+ "</ul></ul><hr>p0rn-proxy ${P0rn::Static::VERSION}/$CVSVERSION</ul>";
- } elsif ($cmd eq ${Static::PROXY_LIST_THUMB} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_THUMB} ) {
$content .= '<h1>thumbnail pages</h1>';
foreach my $u (sort keys %{$thumbs}) {
- $content .= "[<a href=\"$URLBASE/${Static::PROXY_UNMARK_THUMB}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
+ $content .= "[<a href=\"$URLBASE/${P0rn::Static::PROXY_UNMARK_THUMB}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
}
- } elsif ($cmd eq ${Static::PROXY_LIST_PICTURE} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_PICTURE} ) {
$content .= '<h1>picture pages</h1>';
foreach my $u (sort keys %{$pics}) {
- $content .= "[<a href=\"$URLBASE/${Static::PROXY_UNMARK_PICTURE}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
+ $content .= "[<a href=\"$URLBASE/${P0rn::Static::PROXY_UNMARK_PICTURE}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
}
- } elsif ($cmd eq ${Static::PROXY_LIST_DOWNLOAD} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_LIST_DOWNLOAD} ) {
$content .= '<h1>download pages</h1>';
$content .= '<h2>queued</h2>';
foreach my $u (sort keys %{$downs}) {
next unless $downs->{$u} == 0;
- $content .= "[<a href=\"$URLBASE/${Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
+ $content .= "[<a href=\"$URLBASE/${P0rn::Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
}
$content .= '<h2>running</h2>';
foreach my $u (sort keys %{$downs}) {
next unless $downs->{$u} == 1;
- $content .= "[<a href=\"$URLBASE/${Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
+ $content .= "[<a href=\"$URLBASE/${P0rn::Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
}
$content .= '<h2>finished</h2>';
foreach my $u (sort keys %{$downs}) {
next unless $downs->{$u} == 2;
- $content .= "[<a href=\"$URLBASE/${Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
+ $content .= "[<a href=\"$URLBASE/${P0rn::Static::PROXY_UNMARK_DOWNLOAD}/$u\">del</a>] <a href=\"$u\">$u</a><br>";
}
- } elsif ($cmd eq ${Static::PROXY_GET_VERSION} ) {
+ } elsif ($cmd eq ${P0rn::Static::PROXY_GET_VERSION} ) {
- $content .= "\nVERSION: ${Static::VERSION}/$CVSVERSION\n";
+ $content .= "\nVERSION: ${P0rn::Static::VERSION}/$CVSVERSION\n";
} else {
$content .= "unknown command <tt>$cmd</tt>: <tt>".$request->uri().'</tt>';
@@ -342,8 +342,8 @@
my $content = << "EOF";
<html><head><title>thumbnail page</title></head><body>
<a href="$uri">$urishort</a> is considered a thumbnail page and thus not displayed.<br>[
-<a href="$URLBASE/${Static::PROXY_SINGLE_THUMB}/$uri">access once</a>
-| <a href="$URLBASE/${Static::PROXY_UNMARK_THUMB}/$uri">access always</a>
+<a href="$URLBASE/${P0rn::Static::PROXY_SINGLE_THUMB}/$uri">access once</a>
+| <a href="$URLBASE/${P0rn::Static::PROXY_UNMARK_THUMB}/$uri">access always</a>
]</body></html>
EOF
;
@@ -360,8 +360,8 @@
my $content = << "EOF";
<html><head><title>already seen</title></head><body>
<a href="$uri">$urishort</a> is considered an already seen picture page and thus not displayed.<br>[
-<a href="$URLBASE/${Static::PROXY_SINGLE_PICTURE}/$uri">access once</a>
-| <a href="$URLBASE/${Static::PROXY_UNMARK_PICTURE}/$uri">access always</a>
+<a href="$URLBASE/${P0rn::Static::PROXY_SINGLE_PICTURE}/$uri">access once</a>
+| <a href="$URLBASE/${P0rn::Static::PROXY_UNMARK_PICTURE}/$uri">access always</a>
]</body></html>
EOF
;
@@ -389,10 +389,10 @@
my $content = $response->content();
my $linkline = '<p align="center">' .
- '[ th: <a target="_top" href="'."$URLBASE/${Static::PROXY_MARK_THUMB}/$uri".'">mark as thumbnail page</a> ' .
- '| ad: <a target="_top" href="'."$URLBASE/${Static::PROXY_ADMIN}/_nouri_".'">proxy admin</a> ' .
- '| pi: <a target="_top" href="'."$URLBASE/${Static::PROXY_MARK_PICTURE}/$uri".'">mark as picture page</a> ' .
- '| do: <a target="_top" href="'."$URLBASE/${Static::PROXY_MARK_DOWNLOAD}/$uri".'">mark as picture page and download</a> ' .
+ '[ th: <a target="_top" href="'."$URLBASE/${P0rn::Static::PROXY_MARK_THUMB}/$uri".'">mark as thumbnail page</a> ' .
+ '| ad: <a target="_top" href="'."$URLBASE/${P0rn::Static::PROXY_ADMIN}/_nouri_".'">proxy admin</a> ' .
+ '| pi: <a target="_top" href="'."$URLBASE/${P0rn::Static::PROXY_MARK_PICTURE}/$uri".'">mark as picture page</a> ' .
+ '| do: <a target="_top" href="'."$URLBASE/${P0rn::Static::PROXY_MARK_DOWNLOAD}/$uri".'">mark as picture page and download</a> ' .
']<br><br><p>';
$content =~ s/<body([^>]*)>/<body$1>$linkline/i;
@@ -438,7 +438,7 @@
######[ Main program ]
#
-print "this is p0rn-proxy ${Static::VERSION}/${CVSVERSION}\n";
+print "this is p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}\n";
# define configuration options
my $config = AppConfig->new( { CASE => 1 } );
@@ -486,7 +486,7 @@
# create UserAgent
$ua = LWP::UserAgent->new;
-$ua->agent("p0rn-proxy ${Static::VERSION}/${CVSVERSION}");
+$ua->agent("p0rn-proxy ${P0rn::Static::VERSION}/${CVSVERSION}");
if ( defined $config->proxy()
and $config->proxy() ne ""
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/p0rn-comfort/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 May 2006 20:23:46 -0000 1.1
+++ .cvsignore 22 May 2006 20:24:28 -0000 1.2
@@ -0,0 +1 @@
+p0rn-comfort-0.0.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/p0rn-comfort/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 May 2006 20:23:46 -0000 1.1
+++ sources 22 May 2006 20:24:28 -0000 1.2
@@ -0,0 +1 @@
+08be31c527f7577765c4721d1bdf02f7 p0rn-comfort-0.0.4.tar.gz
More information about the fedora-extras-commits
mailing list