packages: libpano13/libpano13.spec - link with libm
Author: sparky Date: Sun Mar 25 22:42:29 2012 GMT
Module: packages Tag: HEAD
Log message:
- link with libm
Files affected:
packages/libpano13:
libpano13.spec (1.8 -> 1.9)
Diffs:
Index: packages/libpano13/libpano13.spec
diff -u packages/libpano13/libpano13.spec:1.8
packages/libpano13/libpano13.spec:1.9
--- packages/libpano13/libpano13.spec:1.8 Tue Jan 24 13:56:00 2012
+++ packages/libpano13/libpano13.spec Mon Mar 26 00:42:24 2012
@@ -67,6 +67,7 @@
%{__autoheader}
%{__automake}
%configure \
+ LIBS="-lm" \
--enable-static \
%{?with_java:--with-java=/usr/%{_lib}/java}%{!?with_java:--without-java}
@@ -130,6 +131,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2012/03/25 22:42:24 sparky
+- link with libm
+
Revision 1.8 2012/01/24 12:56:00 lisu
- rel 2
CVS-web:
http://cvs.pld-linux.org/packages/libpano13/libpano13.spec?r1=1.8&r2=1.9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: enblend-enfuse/enblend-enfuse.spec, enblend-enfuse/enblend-enfuse...
Author: sparky Date: Sun Mar 25 22:45:10 2012 GMT
Module: packages Tag: HEAD
Log message:
- added libpng 1.5 patch (found in arch linux)
Files affected:
packages/enblend-enfuse:
enblend-enfuse.spec (1.18 -> 1.19) , enblend-enfuse-libpng15.patch (NONE ->
1.1) (NEW)
Diffs:
Index: packages/enblend-enfuse/enblend-enfuse.spec
diff -u packages/enblend-enfuse/enblend-enfuse.spec:1.18
packages/enblend-enfuse/enblend-enfuse.spec:1.19
--- packages/enblend-enfuse/enblend-enfuse.spec:1.18Tue Jan 31 22:00:56 2012
+++ packages/enblend-enfuse/enblend-enfuse.spec Mon Mar 26 00:45:04 2012
@@ -11,6 +11,7 @@
# Source0-md5: 2e7c950061e0085fd75d94576130250f
Patch0:%{name}-libpng.patch
Patch1:%{name}-info.patch
+Patch2:%{name}-libpng15.patch
URL: http://enblend.sourceforge.net/
BuildRequires: OpenEXR-devel >= 1.0
BuildRequires: OpenGL-GLU-devel
@@ -52,6 +53,7 @@
%setup -q -n %{name}-%{version}-753b534c819d
%patch0 -p1
%patch1 -p1
+%patch2 -p0
%build
%{__aclocal} -I m4
@@ -92,6 +94,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.19 2012/03/25 22:45:04 sparky
+- added libpng 1.5 patch (found in arch linux)
+
Revision 1.18 2012/01/31 21:00:56 lisu
- BR: transfig (needed to build whole documentation)
Index: packages/enblend-enfuse/enblend-enfuse-libpng15.patch
diff -u /dev/null packages/enblend-enfuse/enblend-enfuse-libpng15.patch:1.1
--- /dev/null Mon Mar 26 00:45:10 2012
+++ packages/enblend-enfuse/enblend-enfuse-libpng15.patch Mon Mar 26
00:45:04 2012
@@ -0,0 +1,220 @@
+--- src/vigra_impex/png.cxx
src/vigra_impex/png.cxx
+@@ -81,7 +81,7 @@
+ static void PngError( png_structp png_ptr, png_const_charp error_msg )
+ {
+ png_error_message = std::string(error_msg);
+-longjmp( png_ptr->jmpbuf, 1 );
++longjmp( png_jmpbuf( png_ptr ), 1 );
+ }
+
+ // called on non-fatal errors
+@@ -213,7 +213,7 @@
+ vigra_postcondition( png != 0, "could not create the read struct." );
+
+ // create info struct
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in
png_create_info_struct(): ").c_str() );
+ }
+@@ -221,14 +221,14 @@
+ vigra_postcondition( info != 0, "could not create the info struct." );
+
+ // init png i/o
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in
png_init_io(): ").c_str() );
+ }
+ png_init_io( png, file.get() );
+
+ // specify that the signature was already read
+-if (setjmp(png->jmpbuf)) {
++if (setjmp(png_jmpbuf( png ))) {
+ png_destroy_read_struct( &png, &info, NULL );
+ vigra_postcondition( false, png_error_message.insert(0, "error in
png_set_sig_bytes(): ").c_str() );
+ }
+@@ -244,13 +244,13 @@
+ void PngDecoderImpl::init()
+ {
+ // read all chunks up to the image data
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in
png_read_info(): ").c_str() );
+ png_read_info( png, info );
+
+ // pull over the header fields
+ int interlace_method, compression_method, filter_method;
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0, "error in
png_get_IHDR(): ").c_str() );
+ png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
+ &interlace_method, &compression_method, &filter_method
);
+@@ -264,7 +264,7 @@
+
+ // transform palette to rgb
+ if ( color_type == PNG_COLOR_TYPE_PALETTE) {
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false, png_error_message.insert(0,
"error in png_palette_to_rgb(): ").c_str() );
+ png_set_palette_to_rgb(png);
+ color_type = PNG_COLOR_TYPE_RGB;
+@@ -273,7 +273,7 @@
+
+ // expand gray values to at least one byte size
+ if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
+-if (setjmp(png->jmpbuf))
++if (setjmp(png_jmpbuf( png )))
+ vigra_postcondition( false,png_error_message.insert(0, "err
packages: tclap/tclap.spec (NEW) - NEW, finish it if you want
Author: sparky Date: Sun Mar 25 23:14:48 2012 GMT
Module: packages Tag: HEAD
Log message:
- NEW, finish it if you want
Files affected:
packages/tclap:
tclap.spec (NONE -> 1.1) (NEW)
Diffs:
Index: packages/tclap/tclap.spec
diff -u /dev/null packages/tclap/tclap.spec:1.1
--- /dev/null Mon Mar 26 01:14:48 2012
+++ packages/tclap/tclap.spec Mon Mar 26 01:14:42 2012
@@ -0,0 +1,48 @@
+# $Revision$, $Date$
+Summary: Argument parser
+Name: tclap
+Version: 1.2.1
+Release: 1
+License: ?
+Group: Libraries
+Source0: http://downloads.sourceforge.net/tclap/%{name}-%{version}.tar.gz
+# Source0-md5: 2e7c950061e0085fd75d94576
+URL: http://tclap.sourceforge.net/
+BuildRequires: libstdc++-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Just headers ?!
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%doc README
+%{_includedir}/%{name}
+%{_pkgconfigdir}/%{name}.pc
+%doc %{_docdir}/%{name}
+
+%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* %{date} PLD Team
+All persons listed below can be reached at @pld-linux.org
+
+$Log$
+Revision 1.1 2012/03/25 23:14:42 sparky
+- NEW, finish it if you want
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: hugin: hugin-2011.4.0.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/hugin/hugin-2011.4.0.tar.bz2 3e4866dbbc7974972604aa18580eae0e hugin-2011.4.0.tar.bz2 Size: 11740410 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: hugin/hugin.spec - updated to 2011.4.0
Author: sparky Date: Sun Mar 25 23:15:21 2012 GMT
Module: packages Tag: HEAD
Log message:
- updated to 2011.4.0
Files affected:
packages/hugin:
hugin.spec (1.52 -> 1.53)
Diffs:
Index: packages/hugin/hugin.spec
diff -u packages/hugin/hugin.spec:1.52 packages/hugin/hugin.spec:1.53
--- packages/hugin/hugin.spec:1.52 Tue Jan 31 21:11:34 2012
+++ packages/hugin/hugin.spec Mon Mar 26 01:15:16 2012
@@ -2,12 +2,12 @@
Summary: Toolchain to create panoramic images
Summary(pl.UTF-8): Zestaw narzędzi do tworzenia panoramicznych zdjęć
Name: hugin
-Version: 2011.0.0
-Release: 2
+Version: 2011.4.0
+Release: 1
License: GPL v2+
Group: X11/Applications/Graphics
Source0:
http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
-# Source0-md5: ac8a129b4c3021233df6d9368c8164cf
+# Source0-md5: 3e4866dbbc7974972604aa18580eae0e
Patch0:%{name}-pl.po-update.patch
Patch1:%{name}-cppflags.patch
URL: http://hugin.sourceforge.net/
@@ -28,6 +28,7 @@
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.471
BuildRequires: sed >= 4.0
+BuildRequires: tclap
BuildRequires: wxGTK2-unicode-devel >= 2.7.0
BuildRequires: wxGTK2-unicode-gl-devel >= 2.7.0
BuildRequires: zlib-devel
@@ -102,7 +103,7 @@
%attr(755,root,root) %{_bindir}/align_image_stack
%attr(755,root,root) %{_bindir}/autooptimiser
%attr(755,root,root) %{_bindir}/autopano-noop.sh
-%attr(755,root,root) %{_bindir}/calibrate_lens
+%attr(755,root,root) %{_bindir}/calibrate_lens_gui
%attr(755,root,root) %{_bindir}/celeste_standalone
%attr(755,root,root) %{_bindir}/checkpto
%attr(755,root,root) %{_bindir}/cpclean
@@ -113,6 +114,7 @@
%attr(755,root,root) %{_bindir}/hugin_hdrmerge
%attr(755,root,root) %{_bindir}/hugin_stitch_project
%attr(755,root,root) %{_bindir}/icpfind
+%attr(755,root,root) %{_bindir}/linefind
%attr(755,root,root) %{_bindir}/matchpoint
%attr(755,root,root) %{_bindir}/nona
%attr(755,root,root) %{_bindir}/nona_gui
@@ -125,9 +127,9 @@
%dir %{_libdir}/hugin
%attr(755,root,root) %{_libdir}/hugin/libceleste.so.*.*
%attr(755,root,root) %{_libdir}/hugin/libflann_cpp.so.*.*
-%attr(755,root,root) %{_libdir}/hugin/libhuginANN.so.*.*
%attr(755,root,root) %{_libdir}/hugin/libhuginbase.so.*.*
%attr(755,root,root) %{_libdir}/hugin/libhuginbasewx.so.*.*
+%attr(755,root,root) %{_libdir}/hugin/libhuginlines.so.*.*
%attr(755,root,root) %{_libdir}/hugin/libhuginvigraimpex.so.*.*
%attr(755,root,root) %{_libdir}/hugin/libicpfindlib.so.*.*
%attr(755,root,root) %{_libdir}/hugin/liblocalfeatures.so.*.*
@@ -136,13 +138,16 @@
%{_datadir}/mime/packages/hugin.xml
%{_desktopdir}/hugin.desktop
%{_desktopdir}/PTBatcherGUI.desktop
+%{_desktopdir}/calibrate_lens_gui.desktop
%{_iconsdir}/hicolor/*/mimetypes/gnome-mime-application-x-ptoptimizer-script.png
%{_pixmapsdir}/hugin.png
%{_pixmapsdir}/ptbatcher.png
+%{_mandir}/man1/PTBatcher.1*
%{_mandir}/man1/PTBatcherGUI.1*
%{_mandir}/man1/align_image_stack.1*
%{_mandir}/man1/autooptimiser.1*
-%{_mandir}/man1/calibrate_lens.1*
+%{_mandir}/man1/autopano-noop.sh.1*
+%{_mandir}/man1/calibrate_lens_gui.1*
%{_mandir}/man1/celeste_standalone.1*
%{_mandir}/man1/checkpto.1*
%{_mandir}/man1/cpclean.1*
@@ -153,6 +158,8 @@
%{_mandir}/man1/hugin_hdrmerge.1*
%{_mandir}/man1/hugin_stitch_project.1*
%{_mandir}/man1/icpfind.1*
+%{_mandir}/man1/linefind.1*
+%{_mandir}/man1/matchpoint.1*
%{_mandir}/man1/nona.1*
%{_mandir}/man1/nona_gui.1*
%{_mandir}/man1/pano_modify.1*
@@ -168,6 +175,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.53 2012/03/25 23:15:16 sparky
+- updated to 2011.4.0
+
Revision 1.52 2012/01/31 20:11:34 lisu
- rel 2
CVS-web:
http://cvs.pld-linux.org/packages/hugin/hugin.spec?r1=1.52&r2=1.53
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin: distfiles/file-fetcher.pl - fixed sprintf with commands that contain...
Author: sparky Date: Fri Sep 23 13:36:39 2011 GMT
Module: admin Tag: HEAD
Log message:
- fixed sprintf with commands that contain % char
Files affected:
admin/distfiles:
file-fetcher.pl (1.57 -> 1.58)
Diffs:
Index: admin/distfiles/file-fetcher.pl
diff -u admin/distfiles/file-fetcher.pl:1.57
admin/distfiles/file-fetcher.pl:1.58
--- admin/distfiles/file-fetcher.pl:1.57Wed Mar 30 20:14:55 2011
+++ admin/distfiles/file-fetcher.pl Fri Sep 23 15:36:33 2011
@@ -264,7 +264,8 @@
$problems .= "$cmd:\n$out\n\n";
}
if ( $? ) {
-$problems .= sprintf "$cmd:\nexited with code %d (0x%02x)\n\n",
+$problems .= sprintf "%s:\nexited with code %d (0x%02x)\n\n",
+ $cmd,
$? >> 8,
$? & 0xff;
}
@@ -281,7 +282,8 @@
$problems .= "$cmd2:\n$out\n\n";
}
if ( $? ) {
- $problems .= sprintf "$cmd2:\nexited with code %d (0x%02x)\n\n",
+ $problems .= sprintf "%s:\nexited with code %d (0x%02x)\n\n",
+$cmd2,
$? >> 8,
$? & 0xff;
}
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/file-fetcher.pl?r1=1.57&r2=1.58&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin: distfiles/specparser.pl - recognize PatchN-md5:
Author: sparky Date: Tue Jun 14 06:56:54 2011 GMT
Module: admin Tag: HEAD
Log message:
- recognize PatchN-md5:
Files affected:
admin/distfiles:
specparser.pl (1.24 -> 1.25)
Diffs:
Index: admin/distfiles/specparser.pl
diff -u admin/distfiles/specparser.pl:1.24 admin/distfiles/specparser.pl:1.25
--- admin/distfiles/specparser.pl:1.24 Wed Dec 8 20:40:50 2010
+++ admin/distfiles/specparser.pl Tue Jun 14 08:56:49 2011
@@ -120,7 +120,7 @@
}
push @spec, $_;
} elsif (/^NoSource\s*:\s*(\d+)\s*$/i) {
-$no_source{$1} = 1;
+$no_source{ "source" . $1 } = 1;
}
}
close(F);
@@ -241,33 +241,33 @@
sub add_md5_to_print($) # {{{
{
open(F, "< $_[0]") or die("failed opening: " . $_[0]);
-my @sourcemap = ();
+my %sourcemap = ();
while () {
chomp;
-if (/^Source(\d+)\s*:\s*(.*)/i) {
-my $sourceno = $1;
+if (/^((?:Source|Patch)\d+)\s*:\s*(.*)/i) {
+my $sourceno = lc $1;
my $source = $2;
# master.dl is outdated currently
# $source =~ s/dl.sourceforge.net/master.dl.sourceforge.net/;
-$sourcemap[$sourceno] = $source;
-} elsif (/^\s*#\s*source(\d+)-md5\s*:\s*([a-f0-9]{32})/i) {
-my $no = $1;
+$sourcemap{ $sourceno } = $source;
+} elsif (/^\s*#\s*((?:source|patch)\d+)-md5\s*:\s*([a-f0-9]{32})/i) {
+my $no = lc $1;
my $md5 = $2;
if (defined $no_source{$no}) {
error("both NoSource: $no and md5 given");
-} elsif (defined $sourcemap[$no]) {
-my $source = $sourcemap[$no];
+} elsif (defined $sourcemap{ $no} ) {
+my $source = $sourcemap{ $no };
push @sources, [$no, $md5, $source];
} else {
error("source $no not defined (# SourceN-md5: has to be placed
just after SourceN:)");
}
-} elsif
(/^\s*BuildRequires:\s*digest\(%SOURCE(\d+)\)\s*=\s*([a-f0-9]{32})/i) {
-my $no = $1;
+} elsif
(/^\s*BuildRequires:\s*digest\(%((?:SOURCE|PATCH)\d+)\)\s*=\s*([a-f0-9]{32})/i)
{
+my $no = lc $1;
my $md5 = $2;
-if (defined $no_source{$no}) {
+if (defined $no_source{ $no }) {
error("both NoSource: $no and md5 given");
-} elsif (defined $sourcemap[$no]) {
-my $source = $sourcemap[$no];
+} elsif (defined $sourcemap{ $no }) {
+my $source = $sourcemap{ $no };
push @sources, [$no, $md5, $source];
} else {
error("source $no not defined (# Source digest has to be
placed after SourceN:)");
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/specparser.pl?r1=1.24&r2=1.25&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/RapidShare
Author: sparky
Date: Mon May 23 00:35:02 2011
New Revision: 12241
Modified:
toys/rsget.pl/Get/RapidShare
Log:
- fix getting 1GB+ files
Modified: toys/rsget.pl/Get/RapidShare
==
--- toys/rsget.pl/Get/RapidShare(original)
+++ toys/rsget.pl/Get/RapidShareMon May 23 00:35:02 2011
@@ -51,7 +51,7 @@
$-{file_uri} =
"http://$host/cgi-bin/rsapi.cgi?sub=download_v1&dlauth=$dlauth&bin=1&fileid=$-{id}&filename=$-{name}";;
- WAIT( $wait, "starting download" );
+ WAIT( -$wait, "starting download" );
DOWNLOAD( $-{file_uri} );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl/perl.spec - I would like ithreads disabled, but there are pa...
Author: sparky Date: Sun May 1 17:23:47 2011 GMT
Module: packages Tag: HEAD
Log message:
- I would like ithreads disabled, but there are packages which would have
to be fixed first: added note which ones
Files affected:
packages/perl:
perl.spec (1.441 -> 1.442)
Diffs:
Index: packages/perl/perl.spec
diff -u packages/perl/perl.spec:1.441 packages/perl/perl.spec:1.442
--- packages/perl/perl.spec:1.441 Tue Mar 1 19:09:45 2011
+++ packages/perl/perl.spec Sun May 1 19:23:41 2011
@@ -14,12 +14,15 @@
# - add the {O,N}DBM_File modules
# - `diagnostics.pm' (perl-base) requires `perldiag.pod' (perl-perldoc)
# move .pod file to -base or S: perl-perldoc in -base
-# - consider disabling ithreads by default
+# - consider disabling ithreads by default; packages that require it:
+# maatkit (dunno, seems complicated), munin-plugins-muninexchange (fixable),
+# whohas (easy to fix), slimrat (no way to fix)
# - what about "prove" (binary+manual)? (conflicts with standalone
Test-Harness)
# - patch MakeMaker to get rid of empty *.bs files (MM_Unix::dynamic_bs())
# - consider separating C/XS development files (*.h, libperl.so)
# and perl development modules (like MakeMaker, Devel...)
-# - subpackage for perl-ExtUtils-MakeMaker, (instmodsh conflicts with
perl-ExtUtils-MakeMaker)
+# - subpackage for perl-ExtUtils-MakeMaker, (instmodsh conflicts with
+# perl-ExtUtils-MakeMaker)
# - resolve ugly perl-base/perl-dirs dependency loop
# (in fact perl-dirs dep in perl-base could be dropped and perl-dirs
#deps in external modules autogenerated - perhaps with proper ">= version")
@@ -1420,6 +1423,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.442 2011/05/01 17:23:41 sparky
+- I would like ithreads disabled, but there are packages which would have
+ to be fixed first: added note which ones
+
Revision 1.441 2011/03/01 18:09:45 qboosh
- removed privlib/IPC from -modules (already packaged in -base)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl/perl.spec?r1=1.441&r2=1.442&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel/kernel-multiarch.config - added missing options
Author: sparky Date: Sun May 1 16:26:20 2011 GMT Module: packages Tag: HEAD Log message: - added missing options Files affected: packages/kernel: kernel-multiarch.config (1.68 -> 1.69) Diffs: Index: packages/kernel/kernel-multiarch.config diff -u packages/kernel/kernel-multiarch.config:1.68 packages/kernel/kernel-multiarch.config:1.69 --- packages/kernel/kernel-multiarch.config:1.68Sun May 1 17:26:18 2011 +++ packages/kernel/kernel-multiarch.config Sun May 1 18:26:14 2011 @@ -696,6 +696,7 @@ GPIO_MAX732X all=m GPIO_PCA953X all=m GPIO_PCF857X all=m +GPIO_SX150X all=m GPIO_TWL4030 powerpc=m GPIO_WM831X all=m GPIO_WM8994 all=m @@ -4008,6 +4009,7 @@ SPI_GPIO all=m SPI_LM70_LLP all=m SPI_MPC52xx_PSC ppc=m +SPI_PXA2XX all=m SPI_TOPCLIFF_PCH all=m SPI_XILINX all=m SPI_DESIGNWARE all=y CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.68&r2=1.69&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel/kernel-multiarch.config, kernel/kernel-patches.config - mo...
Author: sparky Date: Sun May 1 15:26:24 2011 GMT Module: packages Tag: HEAD Log message: - moved some options around to suite vanilla bcond Files affected: packages/kernel: kernel-multiarch.config (1.67 -> 1.68) , kernel-patches.config (1.9 -> 1.10) Diffs: Index: packages/kernel/kernel-multiarch.config diff -u packages/kernel/kernel-multiarch.config:1.67 packages/kernel/kernel-multiarch.config:1.68 --- packages/kernel/kernel-multiarch.config:1.67Sat Apr 23 10:30:05 2011 +++ packages/kernel/kernel-multiarch.config Sun May 1 17:26:18 2011 @@ -5181,7 +5181,6 @@ #- file drivers/char/agp/Kconfig goes here #- file drivers/gpu/vga/Kconfig goes here #- file drivers/gpu/drm/Kconfig goes here -#- file drivers/gpu/misc/Kconfig goes here #- file drivers/gpu/stub/Kconfig goes here VGASTATE all=m VIDEO_OUTPUT_CONTROL all=m @@ -5522,7 +5521,6 @@ #- file fs/adfs/Kconfig goes here #- file fs/affs/Kconfig goes here #- file fs/ecryptfs/Kconfig goes here -#- file fs/unionfs/Kconfig goes here #- file fs/hfs/Kconfig goes here #- file fs/hfsplus/Kconfig goes here #- file fs/befs/Kconfig goes here @@ -5542,7 +5540,6 @@ #- file fs/sysv/Kconfig goes here #- file fs/ufs/Kconfig goes here #- file fs/exofs/Kconfig goes here -#- file fs/aufs/Kconfig goes here NETWORK_FILESYSTEMS all=y #- file fs/nfs/Kconfig goes here #- file fs/nfsd/Kconfig goes here @@ -6003,9 +6000,11 @@ #- #- *** FILE: fs/squashfs/Kconfig *** #- +SQUASHFS all=m SQUASHFS_XATTR all=y SQUASHFS_LZO all=y SQUASHFS_XZ all=y +SQUASHFS_EMBEDDED all=n #- #- *** FILE: fs/sysfs/Kconfig *** @@ -6196,9 +6195,6 @@ SUSPEND_FREEZER ppc=y ppc64=y HIBERNATION all=y PM_STD_PARTITION all="" -#- Image Storage (you need at least one allocator) -#- General Options -#- No compression support available without Cryptoapi support. APM_EMULATION ppc=m PM_RUNTIME all=y @@ -6333,10 +6329,10 @@ DMA_API_DEBUG all=n ATOMIC64_SELFTEST all=n ASYNC_RAID6_TEST all=m -TEST_KSTRTOX all=m #- file samples/Kconfig goes here #- file lib/Kconfig.kgdb goes here #- file lib/Kconfig.kmemcheck goes here +TEST_KSTRTOX all=m #- #- *** FILE: lib/Kconfig.kgdb *** @@ -7023,7 +7019,6 @@ #- SECURITY_APPARMOR=y SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -SECURITY_APPARMOR_COMPAT_24=y #- #- *** FILE: security/integrity/ima/Kconfig *** @@ -7498,6 +7493,7 @@ RTC_DRV_MC13783 all=m RTL8187SE all=m RTL8192SU all=m +SECURITY_APPARMOR_COMPAT_24=y SECURITY_APPARMOR_DISABLE=n SECURITY_APPARMOR_NETWORK=y SECURITY_FILE_CAPABILITIES all=y Index: packages/kernel/kernel-patches.config diff -u packages/kernel/kernel-patches.config:1.9 packages/kernel/kernel-patches.config:1.10 --- packages/kernel/kernel-patches.config:1.9 Mon Feb 28 19:13:26 2011 +++ packages/kernel/kernel-patches.config Sun May 1 17:26:18 2011 @@ -21,8 +21,6 @@ UNION_FS_XATTR all=y UNION_FS_DEBUG all=n -SQUASHFS all=m -SQUASHFS_EMBEDDED all=n SQUASHFS_FRAGMENT_CACHE_SIZE all=3 SQUASHFS_LZMA all=y CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.67&r2=1.68&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.9&r2=1.10&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel/kernel.spec - vanilla bcond fixes
Author: sparky Date: Sun May 1 15:22:14 2011 GMT
Module: packages Tag: HEAD
Log message:
- vanilla bcond fixes
Files affected:
packages/kernel:
kernel.spec (1.911 -> 1.912)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.911 packages/kernel/kernel.spec:1.912
--- packages/kernel/kernel.spec:1.911 Sun May 1 16:29:22 2011
+++ packages/kernel/kernel.spec Sun May 1 17:22:09 2011
@@ -47,6 +47,10 @@
%{?debug:%define with_verbose 1}
+%if %{with vanilla}
+%unglobal with_grsecurity
+%endif
+
%if %{without grsecurity}
%unglobal with_pax
%endif
@@ -100,16 +104,20 @@
%if "%{_alt_kernel}" == ""
%definealt_kernel myown
%endif
-%else
-%if %{without rescuecd}
-%define__alt_kernel
%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
+%else # not myown:
+%if %{with vanilla}
+%definealt_kernel vanilla
+%else # not vanilla:
+%if %{with rescuecd}
+%definealt_kernel rescuecd
+%else # not rescuecd:
+%define__alt_kernel
%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
%if "%{__alt_kernel}" != ""
%definealt_kernel %{__alt_kernel}
%endif
-%else
-%definealt_kernel rescuecd
-%endif
-%endif
+%endif # not rescuecd
+%endif # not vanilla
+%endif # not myown
# kernel release (used in filesystem and eventually in uname -r)
# modules will be looked from /lib/modules/%{kernel_release}
@@ -1538,6 +1546,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.912 2011/05/01 15:22:09 sparky
+- vanilla bcond fixes
+
Revision 1.911 2011/05/01 14:29:22 sparky
- netfilter config required for vanilla as well
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.911&r2=1.912&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: ERRORS: linux-2.6.38.tar.bz2 patch-2.6.38.4.bz2
kernel.spec: undefined macro version Files fetched: 0 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.38.tar.bz2 7d471477bfa67546f902da62227fa976 linux-2.6.38.tar.bz2 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.38.4.bz2 6ef1279c7bd0078fc0fd50aa83e86203 patch-2.6.38.4.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: ERRORS: linux-2.6.35.tar.bz2 patch-2.6.35.13.bz2
kernel.spec: undefined macro version Files fetched: 0 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.bz2 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/patch-2.6.35.13.bz2 017e8564c850d950b91bb4ce94974c07 patch-2.6.35.13.bz2 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (LINUX_2_6_35): kernel/kernel.spec - vanilla: set alt_kernel to va...
Author: sparky Date: Sun May 1 15:11:18 2011 GMT
Module: packages Tag: LINUX_2_6_35
Log message:
- vanilla: set alt_kernel to vanilla (unless myown is set)
Files affected:
packages/kernel:
kernel.spec (1.837.2.11 -> 1.837.2.12)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.11
packages/kernel/kernel.spec:1.837.2.12
--- packages/kernel/kernel.spec:1.837.2.11 Sun May 1 16:46:59 2011
+++ packages/kernel/kernel.spec Sun May 1 17:11:13 2011
@@ -130,16 +130,20 @@
%if "%{_alt_kernel}" == ""
%definealt_kernel myown
%endif
-%else
-%if %{without rescuecd}
+%else # not myown:
+%if %{with vanilla}
+%definealt_kernel vanilla
+%else # not vanilla:
+%if %{with rescuecd}
+%definealt_kernel rescuecd
+%else # not rescuecd:
%define__alt_kernel
%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
%if "%{__alt_kernel}" != ""
%definealt_kernel %{__alt_kernel}
%endif
-%else
-%definealt_kernel rescuecd
-%endif
-%endif
+%endif # not rescuecd
+%endif # not vanilla
+%endif # not myown
# kernel release (used in filesystem and eventually in uname -r)
# modules will be looked from /lib/modules/%{kernel_release}
@@ -1603,6 +1607,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.837.2.12 2011/05/01 15:11:13 sparky
+- vanilla: set alt_kernel to vanilla (unless myown is set)
+
Revision 1.837.2.11 2011/05/01 14:46:59 sparky
- vanilla: make sure grsecurity bcond is disabled, because it affects %files
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837.2.11&r2=1.837.2.12&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (LINUX_2_6_35): kernel/kernel.spec - vanilla: make sure grsecurity...
Author: sparky Date: Sun May 1 14:47:04 2011 GMT
Module: packages Tag: LINUX_2_6_35
Log message:
- vanilla: make sure grsecurity bcond is disabled, because it affects %files
Files affected:
packages/kernel:
kernel.spec (1.837.2.10 -> 1.837.2.11)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.10
packages/kernel/kernel.spec:1.837.2.11
--- packages/kernel/kernel.spec:1.837.2.10 Sun May 1 16:40:42 2011
+++ packages/kernel/kernel.spec Sun May 1 16:46:59 2011
@@ -55,6 +55,10 @@
%{?debug:%define with_verbose 1}
+%if %{with vanilla}
+%unglobal with_grsecurity
+%endif
+
%if %{without grsecurity}
%unglobal with_grsec_full
%unglobal with_grsec_minimal
@@ -1599,6 +1603,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.837.2.11 2011/05/01 14:46:59 sparky
+- vanilla: make sure grsecurity bcond is disabled, because it affects %files
+
Revision 1.837.2.10 2011/05/01 14:40:42 sparky
- added vanilla bcond: disables all patches and extra configs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837.2.10&r2=1.837.2.11&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (LINUX_2_6_35): kernel/kernel-multiarch.config, kernel/kernel-patc...
Author: sparky Date: Sun May 1 14:43:40 2011 GMT Module: packages Tag: LINUX_2_6_35 Log message: - moved some options around to suite vanilla bcond Files affected: packages/kernel: kernel-multiarch.config (1.44 -> 1.44.2.1) , kernel-patches.config (1.8 -> 1.8.2.1) , kernel-x86.config (1.25 -> 1.25.2.1) Diffs: Index: packages/kernel/kernel-multiarch.config diff -u packages/kernel/kernel-multiarch.config:1.44 packages/kernel/kernel-multiarch.config:1.44.2.1 --- packages/kernel/kernel-multiarch.config:1.44Sun Oct 17 20:22:04 2010 +++ packages/kernel/kernel-multiarch.config Sun May 1 16:43:35 2011 @@ -5070,7 +5070,6 @@ #- file fs/jbd/Kconfig goes here #- file fs/jbd2/Kconfig goes here FS_MBCACHE all=m -#- file fs/reiser4/Kconfig goes here #- file fs/reiserfs/Kconfig goes here #- file fs/jfs/Kconfig goes here FS_POSIX_ACL all=y @@ -5102,7 +5101,6 @@ #- file fs/adfs/Kconfig goes here #- file fs/affs/Kconfig goes here #- file fs/ecryptfs/Kconfig goes here -#- file fs/unionfs/Kconfig goes here #- file fs/hfs/Kconfig goes here #- file fs/hfsplus/Kconfig goes here #- file fs/befs/Kconfig goes here @@ -5122,7 +5120,6 @@ #- file fs/sysv/Kconfig goes here #- file fs/ufs/Kconfig goes here #- file fs/exofs/Kconfig goes here -#- file fs/aufs/Kconfig goes here NETWORK_FILESYSTEMS all=y #- file fs/nfs/Kconfig goes here #- file fs/nfsd/Kconfig goes here @@ -5588,7 +5585,9 @@ #- #- *** FILE: fs/squashfs/Kconfig *** #- +SQUASHFS all=m SQUASHFS_XATTRS all=y +SQUASHFS_EMBEDDED all=n #- #- *** FILE: fs/sysfs/Kconfig *** @@ -5770,9 +5769,6 @@ SUSPEND_FREEZER ppc=y ppc64=y HIBERNATION all=y PM_STD_PARTITION all="" -#- Image Storage (you need at least one allocator) -#- General Options -#- No compression support available without Cryptoapi support. APM_EMULATION ppc=m PM_RUNTIME all=y @@ -5810,11 +5806,6 @@ RING_BUFFER_BENCHMARK all=m #- -#- *** FILE: kernel/vserver/Kconfig *** -#- -VSERVER_LEGACY_MEM all=y - -#- #- *** FILE: lib/Kconfig *** #- BITREVERSE all=y @@ -6532,7 +6523,6 @@ #- #- *** FILE: security/Kconfig *** #- -#- file grsecurity/Kconfig goes here KEYS all=y KEYS_DEBUG_PROC_KEYS all=n SECURITY all=y @@ -6543,7 +6533,6 @@ #- file security/selinux/Kconfig goes here #- file security/smack/Kconfig goes here #- file security/tomoyo/Kconfig goes here -#- file security/apparmor/Kconfig goes here #- file security/integrity/ima/Kconfig goes here DEFAULT_SECURITY_SELINUX all=y DEFAULT_SECURITY_SMACK all=n @@ -6990,6 +6979,7 @@ USB_GSPCA_SN9C20X_EVDEV all=y USB_VST all=m USER_SCHED all=n +VSERVER_LEGACY_MEM all=y WAVELAN alpha=m i386=m WIRELESS_OLD_REGULATORY all=y WLAN_80211 all=y Index: packages/kernel/kernel-patches.config diff -u packages/kernel/kernel-patches.config:1.8 packages/kernel/kernel-patches.config:1.8.2.1 --- packages/kernel/kernel-patches.config:1.8 Wed Sep 29 10:57:36 2010 +++ packages/kernel/kernel-patches.config Sun May 1 16:43:35 2011 @@ -21,8 +21,6 @@ UNION_FS_XATTR all=y UNION_FS_DEBUG all=n -SQUASHFS all=m -SQUASHFS_EMBEDDED all=n SQUASHFS_FRAGMENT_CACHE_SIZE all=3 SQUASHFS_LZMA all=y Index: packages/kernel/kernel-x86.config diff -u packages/kernel/kernel-x86.config:1.25 packages/kernel/kernel-x86.config:1.25.2.1 --- packages/kernel/kernel-x86.config:1.25 Wed Aug 25 20:32:35 2010 +++ packages/kernel/kernel-x86.config Sun May 1 16:43:35 2011 @@ -47,6 +47,7 @@ NR_CPUS x86=32 SCHED_SMT x86=y SCHED_MC x86=y +IRQ_TIME_ACCOUNTING x86=n #- file kernel/Kconfig.preempt goes here X86_UP_APIC i386=y X86_UP_IOAPIC i386=y CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.44&r2=1.44.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-patches.config?r1=1.8&r2=1.8.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.25&r2=1.25.2.1&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages (LINUX_2_6_35): kernel/kernel.spec - added vanilla bcond: disables...
Author: sparky Date: Sun May 1 14:40:47 2011 GMT
Module: packages Tag: LINUX_2_6_35
Log message:
- added vanilla bcond: disables all patches and extra configs
Files affected:
packages/kernel:
kernel.spec (1.837.2.9 -> 1.837.2.10)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837.2.9
packages/kernel/kernel.spec:1.837.2.10
--- packages/kernel/kernel.spec:1.837.2.9 Fri Apr 29 12:13:19 2011
+++ packages/kernel/kernel.spec Sun May 1 16:40:42 2011
@@ -49,8 +49,8 @@
%bcond_without tuxonice# support for tuxonice (ex-suspend2) (enabled
by default)
%bcond_without apparmor# build kernel with apparmor (exerimental mix)
+%bcond_withvanilla # don't include any patches
%bcond_withrescuecd# build kernel for our rescue
-
%bcond_withmyown # build with your own config
(kernel-myown.config)
%{?debug:%define with_verbose 1}
@@ -702,6 +702,8 @@
%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
%endif
+%if %{without vanilla}
+
# tuxonice:
%if %{with tuxonice}
%patch69 -p1
@@ -853,6 +855,8 @@
# routes
%patch300 -p1
+%endif # vanilla
+
# Small fixes:
%patch2000 -p1
%patch2001 -p1
@@ -1041,6 +1045,7 @@
$RPM_SOURCE_DIR/kernel-%{alt_kernel}.config \
%endif
important.config \
+%if %{without vanilla}
%if %{with rescuecd}
%{SOURCE58} \
%{SOURCE59} \
@@ -1079,8 +1084,9 @@
%{SOURCE42} \
%endif
%endif
- %{SOURCE40} %{?0:netfilter} \
%{SOURCE41} %{?0:patches} \
+%endif
+ %{SOURCE40} %{?0:netfilter} \
%{SOURCE20} \
$RPM_SOURCE_DIR/$Config
}
@@ -1593,6 +1599,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.837.2.10 2011/05/01 14:40:42 sparky
+- added vanilla bcond: disables all patches and extra configs
+
Revision 1.837.2.9 2011/04/29 10:13:19 areq
- 2.6.35.13
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837.2.9&r2=1.837.2.10&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel/kernel.spec - netfilter config required for vanilla as well
Author: sparky Date: Sun May 1 14:29:27 2011 GMT
Module: packages Tag: HEAD
Log message:
- netfilter config required for vanilla as well
Files affected:
packages/kernel:
kernel.spec (1.910 -> 1.911)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.910 packages/kernel/kernel.spec:1.911
--- packages/kernel/kernel.spec:1.910 Sun May 1 16:23:54 2011
+++ packages/kernel/kernel.spec Sun May 1 16:29:22 2011
@@ -1022,9 +1022,9 @@
%{SOURCE42} \
%endif
%endif
- %{SOURCE40} %{?0:netfilter} \
%{SOURCE41} %{?0:patches} \
%endif
+ %{SOURCE40} %{?0:netfilter} \
%{SOURCE20} \
$RPM_SOURCE_DIR/$Config
}
@@ -1538,6 +1538,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.911 2011/05/01 14:29:22 sparky
+- netfilter config required for vanilla as well
+
Revision 1.910 2011/05/01 14:23:54 sparky
- added vanilla bcond: disables all patches and extra configs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.910&r2=1.911&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: kernel/kernel.spec - added vanilla bcond: disables all patches an...
Author: sparky Date: Sun May 1 14:24:00 2011 GMT
Module: packages Tag: HEAD
Log message:
- added vanilla bcond: disables all patches and extra configs
Files affected:
packages/kernel:
kernel.spec (1.909 -> 1.910)
Diffs:
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.909 packages/kernel/kernel.spec:1.910
--- packages/kernel/kernel.spec:1.909 Sat Apr 23 11:14:31 2011
+++ packages/kernel/kernel.spec Sun May 1 16:23:54 2011
@@ -41,8 +41,8 @@
%bcond_without vserver # support for VServer (enabled by default)
%bcond_without tuxonice# support for tuxonice (ex-suspend2) (enabled
by default)
+%bcond_withvanilla # don't include any patches
%bcond_withrescuecd# build kernel for our rescue
-
%bcond_withmyown # build with your own config
(kernel-myown.config)
%{?debug:%define with_verbose 1}
@@ -670,6 +670,8 @@
%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
%endif
+%if %{without vanilla}
+
# tuxonice:
%if %{with tuxonice}
%patch69 -p1
@@ -801,6 +803,8 @@
# virtio-gl
%patch400 -p1
+%endif # vanilla
+
# Small fixes:
%patch2000 -p1
%patch2001 -p1
@@ -983,6 +987,7 @@
$RPM_SOURCE_DIR/kernel-%{alt_kernel}.config \
%endif
important.config \
+%if %{without vanilla}
%if %{with rescuecd}
%{SOURCE58} \
%{SOURCE59} \
@@ -1019,6 +1024,7 @@
%endif
%{SOURCE40} %{?0:netfilter} \
%{SOURCE41} %{?0:patches} \
+%endif
%{SOURCE20} \
$RPM_SOURCE_DIR/$Config
}
@@ -1532,6 +1538,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.910 2011/05/01 14:23:54 sparky
+- added vanilla bcond: disables all patches and extra configs
+
Revision 1.909 2011/04/23 09:14:31 baggins
- rel 2
- fixed/updated grsec patch
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.909&r2=1.910&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wanpipe/wanpipe.spec - must include Makefile.kbuild before ifdef
Author: sparky Date: Sat Apr 30 20:16:01 2011 GMT
Module: packages Tag: HEAD
Log message:
- must include Makefile.kbuild before ifdef
Files affected:
packages/wanpipe:
wanpipe.spec (1.57 -> 1.58)
Diffs:
Index: packages/wanpipe/wanpipe.spec
diff -u packages/wanpipe/wanpipe.spec:1.57 packages/wanpipe/wanpipe.spec:1.58
--- packages/wanpipe/wanpipe.spec:1.57 Sun Apr 17 15:42:41 2011
+++ packages/wanpipe/wanpipe.spec Sat Apr 30 22:15:56 2011
@@ -32,13 +32,14 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
+BuildRequires: dahdi-linux-devel
BuildRequires: flex
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.22}
BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: ncurses-devel >= 5.2
BuildRequires: rpmbuild(macros) >= 1.379
-BuildRequires: dahdi-linux-devel
+BuildRequires: sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -94,8 +95,8 @@
sed -i 's#MODULE_EXT=".ko"#MODULE_EXT=".ko.gz"#' util/lxdialog/Makefile
sed -i 's/libstelephony\.cpp//; s#libstelephony_la_SOURCES
*=#libstelephony_la_SOURCES = libstelephony.cpp#' api/libstelephony/Makefile.am
sed -i '/lib_LIBRARIES/d; /libstelephony_a_CXXFLAGS/d' -i
api/libstelephony/Makefile.am
-#echo 'EXTRA_CFLAGS += -D__LINUX__ -I$(HOMEDIR)/patches/kdrivers/include' >>
patches/kdrivers/src/net/Makefile
-#grep "PRODUCT_DEFINES" Makefile >> patches/kdrivers/src/net/Makefile
+
+sed "1a\include $(pwd)/Makefile.kbuild" -i patches/kdrivers/src/net/Makefile
%build
cd api/libstelephony
@@ -110,7 +111,6 @@
INSTALLPREFIX=%{buildroot}
%if %{with kernel}
-echo "include $(pwd)/Makefile.kbuild" >> patches/kdrivers/src/net/Makefile
%build_kernel_modules -C patches/kdrivers/src/net -m
{af_wanpipe,sdladrv,wanrouter,wanpipe,wanpipe_syncppp,wanec,wan_aften}
%endif
@@ -192,6 +192,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.58 2011/04/30 20:15:56 sparky
+- must include Makefile.kbuild before ifdef
+
Revision 1.57 2011/04/17 13:42:41 sparky
- added recfnt and kbuild patches
- switched to %*_kernel_modules macros
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wanpipe/wanpipe.spec?r1=1.57&r2=1.58&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Coro/perl-Coro.spec - dropped BR: perl-Scalar-List-Utils (pe...
Author: sparky Date: Thu Apr 28 14:37:54 2011 GMT
Module: packages Tag: HEAD
Log message:
- dropped BR: perl-Scalar-List-Utils (perl-modules provides it already)
Files affected:
packages/perl-Coro:
perl-Coro.spec (1.20 -> 1.21)
Diffs:
Index: packages/perl-Coro/perl-Coro.spec
diff -u packages/perl-Coro/perl-Coro.spec:1.20
packages/perl-Coro/perl-Coro.spec:1.21
--- packages/perl-Coro/perl-Coro.spec:1.20 Wed Mar 9 17:53:05 2011
+++ packages/perl-Coro/perl-Coro.spec Thu Apr 28 16:37:48 2011
@@ -21,12 +21,11 @@
URL: http://search.cpan.org/dist/Coro/
BuildRequires: perl-AnyEvent >= 2:5.0
BuildRequires: perl-EV >= 1:3.3
-BuildRequires: perl-Event >= 0.89
+BuildRequires: perl-Event >= 1.08
BuildRequires: perl-devel >= 1:5.8.2
BuildRequires: rpm-perlprov >= 4.1-13
%if %{with tests}
BuildRequires: perl-Guard >= 0.5
-BuildRequires: perl-Scalar-List-Utils
BuildRequires: perl-Storable >= 2.15
BuildRequires: perl-Time-HiRes
BuildRequires: perl-common-sense
@@ -88,6 +87,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.21 2011/04/28 14:37:48 sparky
+- dropped BR: perl-Scalar-List-Utils (perl-modules provides it already)
+
Revision 1.20 2011/03/09 16:53:05 qboosh
- more BRs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Coro/perl-Coro.spec?r1=1.20&r2=1.21&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Curl.pm
Author: sparky
Date: Wed Apr 27 18:54:27 2011
New Revision: 12234
Modified:
toys/rsget.pl/RSGet/Curl.pm
Log:
- WWW::CurlOO renamed to Net::Curl
Modified: toys/rsget.pl/RSGet/Curl.pm
==
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Wed Apr 27 18:54:27 2011
@@ -11,15 +11,15 @@
use RSGet::Line;
use RSGet::Hook;
BEGIN {
- eval { require WWW::CurlOO::Compat; };
+ eval { require Net::Curl::Compat; };
if ( $@ ) {
- warn "\nERROR::Could not load WWW::CurlOO::Compat -- " .
+ warn "\nERROR::Could not load Net::Curl::Compat -- " .
"will use WWW::Curl instead\n";
- warn "NOTE: future rsget.pl versions will require WWW::CurlOO
to run,\n" .
+ warn "NOTE: future rsget.pl versions will require Net::Curl to
run,\n" .
"so make sure it is available in your operating system
before " .
"that happens.\n\n";
} else {
- print "Using WWW::CurlOO, woohoo !\n";
+ print "Using Net::Curl, woohoo !\n";
}
}
use WWW::Curl::Easy 4.00;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: curl: curl-7.21.6.tar.lzma
Files fetched: 1 STORED: http://curl.haxx.se/download/curl-7.21.6.tar.lzma c90b24164c0662f2c16777d40a625557 curl-7.21.6.tar.lzma Size: 1882909 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: curl/curl.spec - updated to: 7.21.6 (bugfix release) - release: 1
Author: sparky Date: Sun Apr 24 14:28:31 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated to: 7.21.6 (bugfix release)
- release: 1
Files affected:
packages/curl:
curl.spec (1.189 -> 1.190)
Diffs:
Index: packages/curl/curl.spec
diff -u packages/curl/curl.spec:1.189 packages/curl/curl.spec:1.190
--- packages/curl/curl.spec:1.189 Thu Apr 21 20:04:27 2011
+++ packages/curl/curl.spec Sun Apr 24 16:28:25 2011
@@ -16,18 +16,17 @@
Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и
других
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та
інших
Name: curl
-Version: 7.21.5
-Release: 2
+Version: 7.21.6
+Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: decd5586c2bd0496ca562dc8a7244e24
+# Source0-md5: c90b24164c0662f2c16777d40a625557
Patch0:%{name}-no_strip.patch
Patch1:%{name}-ac.patch
Patch2:%{name}-pc.patch
Patch3:%{name}-krb5flags.patch
Patch4:libcurl.fb-changes.diff
-Patch5:%{name}-config.patch
URL: http://curl.haxx.se/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
@@ -192,7 +191,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
%{__libtoolize}
@@ -264,6 +262,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.190 2011/04/24 14:28:25 sparky
+- updated to: 7.21.6 (bugfix release)
+- release: 1
+
Revision 1.189 2011/04/21 18:04:27 qboosh
- added config patch (fixes curl-config --version)
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/curl/curl.spec?r1=1.189&r2=1.190&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: curl/curl-config.patch (REMOVED) - fixed in 7.21.6
Author: sparky Date: Sun Apr 24 14:28:02 2011 GMT Module: packages Tag: HEAD Log message: - fixed in 7.21.6 Files affected: packages/curl: curl-config.patch (1.1 -> NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: corosync/corosync.spec - DO NOT SET skip_post_check_so WITHOUT GI...
Author: sparky Date: Fri Apr 22 14:01:08 2011 GMT
Module: packages Tag: HEAD
Log message:
- DO NOT SET skip_post_check_so WITHOUT GIVING A GOOD REASON
- release down to: 0.1
Files affected:
packages/corosync:
corosync.spec (1.13 -> 1.14)
Diffs:
Index: packages/corosync/corosync.spec
diff -u packages/corosync/corosync.spec:1.13
packages/corosync/corosync.spec:1.14
--- packages/corosync/corosync.spec:1.13Fri Apr 22 15:41:30 2011
+++ packages/corosync/corosync.spec Fri Apr 22 16:01:03 2011
@@ -8,7 +8,7 @@
Summary(pl.UTF-8): Corosync - implementacja silnika klastrowego
certyfikowana przez OSI
Name: corosync
Version: 1.3.0
-Release: 1
+Release: 0.1
License: BSD
Group: Base
Source0:
ftp://ftp:downlo...@corosync.org/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -26,7 +26,8 @@
Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%defineskip_post_check_so libtotem_pg.so.4.0.0
+# REASON TO SKIP SO CHECK IS MISSING
+#%%define skip_post_check_so libtotem_pg.so.4.0.0
%description
The Corosync Cluster Engine is an OSI Certified implementation of a
@@ -46,8 +47,8 @@
Certified implementation of a complete cluster engine.
%description libs -l pl.UTF-8
-Ten pakiet zawiera biblioteki Corosync Cluster Engine - pełnego silnika
-klastrowego certyfikowanego przez OSI.
+Ten pakiet zawiera biblioteki Corosync Cluster Engine - pełnego
+silnika klastrowego certyfikowanego przez OSI.
%package devel
Summary: Header files for Corosync libraries
@@ -93,14 +94,14 @@
%{__make}
%{?with_apidocs:%{__make} doxygen}
-
+
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT/usr/share/doc/corosync
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/corosync
sed -e 's/^/#/' $RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf.example \
>$RPM_BUILD_ROOT%{_sysconfdir}/corosync/corosync.conf
@@ -234,6 +235,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.14 2011/04/22 14:01:03 sparky
+- DO NOT SET skip_post_check_so WITHOUT GIVING A GOOD REASON
+- release down to: 0.1
+
Revision 1.13 2011/04/22 13:41:30 alucard
- up to 1.3.0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/corosync/corosync.spec?r1=1.13&r2=1.14&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Premium/FileServe
Author: sparky
Date: Fri Apr 22 02:52:21 2011
New Revision: 12232
Added:
toys/rsget.pl/Premium/FileServe (contents, props changed)
Log:
- NEW: premium fileserve getter
Added: toys/rsget.pl/Premium/FileServe
==
--- (empty file)
+++ toys/rsget.pl/Premium/FileServe Fri Apr 22 02:52:21 2011
@@ -0,0 +1,48 @@
+# $Id$
+# Premium::FileServe - File getter plugin for rsget.pl
+#
+# 2011 (c) Przemysław Iskra
+# This program is free software,
+# you may distribute it under GPL v2 or newer.
+
+name: FileServe
+short: *FSRV
+web: "http://fileserve.com/";
+tos: "http://fileserve.com/terms.php";
+uri: qr{fileserve\.com/file/[A-Za-z0-9]+(/.*)?}
+cookie: fsrv.p
+slots: max
+status: OK 2011-03-03
+
+pre:
+ my ($user, $pass);
+ if ( my $s = setting("premium_fileserve") ) {
+ ($user, $pass) = ($s =~ /^(.+?):(.+)/) or die "Premium
user:pass incorrect\n";
+ } else {
+ die "Premium user:pass not given\n";
+ }
+
+unify:
+ s/#.*//;
+ return "http://fileserve.com/file/$1";
+ if m{fileserve\.com/file/([A-Za-z0-9]+)};
+
+start:
+ GET( $-{_uri} );
+
+ ERROR( "file not found: $1" ) if m#\s*(.*?)\s*#s
+ or m{.*?(.*?)}s;
+
+ ! m#(.+?)#;
+ my $fname = $1;
+ ! m#($STDSIZE) \| Uploaded on #o;
+ INFO( name => $fname, asize => $1 );
+
+ ! ( $-{captcha_key} ) = m{var reCAPTCHA_publickey='(.*?)';};
+ ! ( $-{captcha_encode} ) = m{"recaptcha_shortencode_field".*?
value="(.*?)" />};
+
+ DOWNLOAD( "/login.php", post => { loginUserName => $user,
+ loginUserPassword => $pass, autoLogin => 'on',
+ loginFormSubmit => 'Login' } );
+
+# vim: filetype=perl:ts=4:sw=4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: curl: curl-7.21.5.tar.lzma
Files fetched: 1 STORED: http://curl.haxx.se/download/curl-7.21.5.tar.lzma decd5586c2bd0496ca562dc8a7244e24 curl-7.21.5.tar.lzma Size: 1857592 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: curl/curl.spec - updated to: 7.21.5
Author: sparky Date: Sun Apr 17 23:51:18 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated to: 7.21.5
Files affected:
packages/curl:
curl.spec (1.187 -> 1.188)
Diffs:
Index: packages/curl/curl.spec
diff -u packages/curl/curl.spec:1.187 packages/curl/curl.spec:1.188
--- packages/curl/curl.spec:1.187 Fri Apr 1 12:19:33 2011
+++ packages/curl/curl.spec Mon Apr 18 01:51:12 2011
@@ -16,12 +16,12 @@
Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и
других
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та
інших
Name: curl
-Version: 7.21.4
+Version: 7.21.5
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: 074fa396afe3dbf10163c05756a5a85d
+# Source0-md5: decd5586c2bd0496ca562dc8a7244e24
Patch0:%{name}-no_strip.patch
Patch1:%{name}-ac.patch
Patch2:%{name}-pc.patch
@@ -262,6 +262,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.188 2011/04/17 23:51:12 sparky
+- updated to: 7.21.5
+
Revision 1.187 2011/04/01 10:19:33 jajcus
- ldap bcond added
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/curl/curl.spec?r1=1.187&r2=1.188&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: curl/curl-pc.patch - up for 7.21.5
Author: sparky Date: Sun Apr 17 23:50:50 2011 GMT
Module: packages Tag: HEAD
Log message:
- up for 7.21.5
Files affected:
packages/curl:
curl-pc.patch (1.2 -> 1.3)
Diffs:
Index: packages/curl/curl-pc.patch
diff -u packages/curl/curl-pc.patch:1.2 packages/curl/curl-pc.patch:1.3
--- packages/curl/curl-pc.patch:1.2 Tue Feb 9 20:30:15 2010
+++ packages/curl/curl-pc.patch Mon Apr 18 01:50:45 2011
@@ -3,7 +3,7 @@
@@ -35,6 +35,6 @@
URL: http://curl.haxx.se/
Description: Library to transfer files with ftp, http, etc.
- Version: @VERSION@
+ Version: @CURLVERSION@
-Libs: -L${libdir} -lcurl @LIBS@
+Libs: -L${libdir} -lcurl
Libs.private: @LIBCURL_LIBS@ @LIBS@
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/curl/curl-pc.patch?r1=1.2&r2=1.3&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wanpipe/wanpipe.spec - added recfnt and kbuild patches - switched...
Author: sparky Date: Sun Apr 17 13:42:46 2011 GMT
Module: packages Tag: HEAD
Log message:
- added recfnt and kbuild patches
- switched to %*_kernel_modules macros
- manually call autotools
Files affected:
packages/wanpipe:
wanpipe.spec (1.56 -> 1.57)
Diffs:
Index: packages/wanpipe/wanpipe.spec
diff -u packages/wanpipe/wanpipe.spec:1.56 packages/wanpipe/wanpipe.spec:1.57
--- packages/wanpipe/wanpipe.spec:1.56 Fri Apr 15 22:11:12 2011
+++ packages/wanpipe/wanpipe.spec Sun Apr 17 15:42:41 2011
@@ -26,11 +26,16 @@
Patch1:%{name}-opt.patch
Patch2:%{name}-setup.patch
Patch3:%{name}-include-limits.patch
+Patch4:%{name}-kbuild.patch
+Patch5:%{name}-refcnt.patch
URL: http://www.sangoma.com/
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: bison
BuildRequires: flex
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.22}
BuildRequires: libstdc++-devel
+BuildRequires: libtool
BuildRequires: ncurses-devel >= 5.2
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: dahdi-linux-devel
@@ -76,33 +81,40 @@
Ten pakiet zawiera moduł WANPIPE dla Linuksa.
%prep
-%setup -q
+%setup -q
#%patch0 -p1
#%patch1 -p1
%patch2 -p1
#%patch3 -p1
+%patch4 -p1
+%patch5 -p1
sed -i 's#EXTRA_UTIL_FLAGS = #EXTRA_UTIL_FLAGS = -I/usr/include/ncurses #'
Makefile
sed -i 's###' util/lxdialog/Makefile
sed -i 's#MODULE_EXT=".ko"#MODULE_EXT=".ko.gz"#' util/lxdialog/Makefile
+sed -i 's/libstelephony\.cpp//; s#libstelephony_la_SOURCES
*=#libstelephony_la_SOURCES = libstelephony.cpp#' api/libstelephony/Makefile.am
+sed -i '/lib_LIBRARIES/d; /libstelephony_a_CXXFLAGS/d' -i
api/libstelephony/Makefile.am
+#echo 'EXTRA_CFLAGS += -D__LINUX__ -I$(HOMEDIR)/patches/kdrivers/include' >>
patches/kdrivers/src/net/Makefile
+#grep "PRODUCT_DEFINES" Makefile >> patches/kdrivers/src/net/Makefile
%build
+cd api/libstelephony
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ../..
+
+%{__make} all_kmod_dahdi all_util all_lib \
+ DAHDI_DIR=/usr \
+ INSTALLPREFIX=%{buildroot}
%if %{with kernel}
- cfg=%{!?with_dist_kernel:non}dist
- install -d o/include/{linux,config}
- ln -sf %{_kernelsrcdir}/config-$cfg o/.config
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h
o/include/linux/autoconf.h
-
- %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
-
- export KBUILD_MODPOST_WARN=1
-
- %{__make} dahdi DAHDI_DIR=/usr KDIR=$PWD/o KVER=%{_kernel_ver}
INSTALLPREFIX=%{buildroot}
-
+echo "include $(pwd)/Makefile.kbuild" >> patches/kdrivers/src/net/Makefile
+%build_kernel_modules -C patches/kdrivers/src/net -m
{af_wanpipe,sdladrv,wanrouter,wanpipe,wanpipe_syncppp,wanec,wan_aften}
%endif
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig},/var/log} \
@@ -125,14 +137,8 @@
touch $RPM_BUILD_ROOT/var/log/wanrouter
%if %{with kernel}
-install -d
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/{net/wanrouter,drivers/net/wan}
-
-install patches/kdrivers/src/net/{wanec,af_wanpipe,wanrouter}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/wanrouter
-
-install
patches/kdrivers/src/net/{sdladrv,wanpipe_syncppp,wanpipe,wan_aften}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/wan
-
+%install_kernel_modules -m
patches/kdrivers/src/net/{wanec,af_wanpipe,wanrouter} -d kernel/net/wanrouter
+%install_kernel_modules -m
patches/kdrivers/src/net/{sdladrv,wanpipe_syncppp,wanpipe,wan_aften} -d
kernel/drivers/net/wan
%endif
%clean
@@ -186,6 +192,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.57 2011/04/17 13:42:41 sparky
+- added recfnt and kbuild patches
+- switched to %*_kernel_modules macros
+- manually call autotools
+
Revision 1.56 2011/04/15 20:11:12 areq
- 3.5.20
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wanpipe/wanpipe.spec?r1=1.56&r2=1.57&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wanpipe/wanpipe-kbuild.patch (NEW) - NEW: don't try to build kern...
Author: sparky Date: Sun Apr 17 13:40:43 2011 GMT Module: packages Tag: HEAD Log message: - NEW: don't try to build kernel modules, just preconfigure Files affected: packages/wanpipe: wanpipe-kbuild.patch (NONE -> 1.1) (NEW) Diffs: Index: packages/wanpipe/wanpipe-kbuild.patch diff -u /dev/null packages/wanpipe/wanpipe-kbuild.patch:1.1 --- /dev/null Sun Apr 17 15:40:43 2011 +++ packages/wanpipe/wanpipe-kbuild.patch Sun Apr 17 15:40:38 2011 @@ -0,0 +1,15 @@ +--- wanpipe-3.5.20/Makefile~ 2011-04-17 15:17:04.192510763 +0200 wanpipe-3.5.20/Makefile2011-04-17 15:24:44.709166444 +0200 +@@ -199,7 +199,10 @@ + + #Build only kernel modules +-all_kmod_dahdi: _checkzap _checksrc _cleanoldwanpipe _check_kver +- $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(DAHDI_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR=$(ZAPDIR_PRIV) ZAPHDLC=$(ZAPHDLC_PRIV) HOMEDIR=$(PWD) modules ++all_kmod_dahdi: _checkzap ++ echo "EXTRA_FLAGS = $(EXTRA_CFLAGS) $(DAHDI_CFLAGS) $(shell cat ./patches/kfeatures)" >> Makefile.kbuild ++ echo "ZAPDIR = $(ZAPDIR_PRIV)" >> Makefile.kbuild ++ echo "ZAPHDLC = $(ZAPHDLC_PRIV)" >> Makefile.kbuild ++ echo "HOMEDIR = $(PWD)" >> Makefile.kbuild + + all_kmod: _checksrc _cleanoldwanpipe _check_kver + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C $(KDIR) SUBDIRS=$(WAN_DIR) EXTRA_FLAGS="$(EXTRA_CFLAGS) $(shell cat ./patches/kfeatures)" ZAPDIR= ZAPHDLC= HOMEDIR=$(PWD) modules ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: wanpipe/wanpipe-refcnt.patch (NEW) - NEW: use dev_put() to decrem...
Author: sparky Date: Sun Apr 17 13:40:08 2011 GMT
Module: packages Tag: HEAD
Log message:
- NEW: use dev_put() to decrement refcnt
Files affected:
packages/wanpipe:
wanpipe-refcnt.patch (NONE -> 1.1) (NEW)
Diffs:
Index: packages/wanpipe/wanpipe-refcnt.patch
diff -u /dev/null packages/wanpipe/wanpipe-refcnt.patch:1.1
--- /dev/null Sun Apr 17 15:40:08 2011
+++ packages/wanpipe/wanpipe-refcnt.patch Sun Apr 17 15:40:03 2011
@@ -0,0 +1,14 @@
+--- wanpipe-3.5.20/patches/kdrivers/src/wanrouter/wanmain.c~ 2011-04-17
15:15:10.162513484 +0200
wanpipe-3.5.20/patches/kdrivers/src/wanrouter/wanmain.c2011-04-17
15:15:24.459179809 +0200
+@@ -2136,10 +2136,7 @@
+ void wan_skb_destructor (struct sk_buff *skb)
+ {
+ if (skb->dev){
+- struct net_device *dev=skb->dev;
+- atomic_dec(&(dev)->refcnt);
+- //printk(KERN_INFO "%s: Skb destructor: put dev: refcnt=%i\n",
+- // dev->name,atomic_read(&dev->refcnt));
++ dev_put( skb->dev );
+ }
+ }
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: rakarrack/rakarrack.spec - BR: pkgconfig
Author: sparky Date: Sat Apr 16 23:56:23 2011 GMT Module: packages Tag: HEAD Log message: - BR: pkgconfig Files affected: packages/rakarrack: rakarrack.spec (1.2 -> 1.3) Diffs: Index: packages/rakarrack/rakarrack.spec diff -u packages/rakarrack/rakarrack.spec:1.2 packages/rakarrack/rakarrack.spec:1.3 --- packages/rakarrack/rakarrack.spec:1.2 Sun Apr 17 01:42:52 2011 +++ packages/rakarrack/rakarrack.spec Sun Apr 17 01:56:18 2011 @@ -1,6 +1,6 @@ # $Revision$, $Date$ Summary: Guitar effects for Linux -Summary(pl.UTF-8): Efekty fitarowe dla Linuksa +Summary(pl.UTF-8): Efekty gitarowe dla Linuksa Name: rakarrack Version: 0.6.1 Release: 2 @@ -18,6 +18,7 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel +BuildRequires: pkgconfig BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXft-devel BuildRequires: xorg-lib-libXpm-devel @@ -84,9 +85,11 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.3 2011/04/16 23:56:18 sparky +- BR: pkgconfig + Revision 1.2 2011/04/16 23:42:52 baggins - R/BR alsa-utils Revision 1.1 2011/04/16 22:58:12 baggins - initial revision - CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rakarrack/rakarrack.spec?r1=1.2&r2=1.3&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: libcassandra/libcassandra.spec - DO NOT CALL autorun.sh !
Author: sparky Date: Thu Apr 14 14:44:33 2011 GMT
Module: packages Tag: HEAD
Log message:
- DO NOT CALL autorun.sh !
Files affected:
packages/libcassandra:
libcassandra.spec (1.1 -> 1.2)
Diffs:
Index: packages/libcassandra/libcassandra.spec
diff -u packages/libcassandra/libcassandra.spec:1.1
packages/libcassandra/libcassandra.spec:1.2
--- packages/libcassandra/libcassandra.spec:1.1 Thu Apr 14 15:28:58 2011
+++ packages/libcassandra/libcassandra.spec Thu Apr 14 16:44:28 2011
@@ -51,18 +51,13 @@
%patch0 -p1
%build
-./config/autorun.sh
-# if ac/am/lt/* rebuilding is necessary, do it in this order and add
-# appropriate BuildRequires
-#%{__libtoolize}
-#%{__aclocal}
-# %{__autoconf}
-#%{__autoheader}
-#%{__automake}
-# When autoconf is not called last (as is in) ./config/autorun.sh build fails.
-# %{__autoconf}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
- CXXFLAGS="%{rpmcxxflags} -Wno-variadic-macros -Wno-deprecated"
+ CXXFLAGS="%{rpmcxxflags} -Wno-error"
%{__make}
%install
@@ -102,6 +97,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.2 2011/04/14 14:44:28 sparky
+- DO NOT CALL autorun.sh !
+
Revision 1.1 2011/04/14 13:28:58 matkor
- Initial. Needs testing.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libcassandra/libcassandra.spec?r1=1.1&r2=1.2&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Premium/FileSonic
Author: sparky
Date: Wed Apr 13 01:14:24 2011
New Revision: 12227
Added:
toys/rsget.pl/Premium/FileSonic (contents, props changed)
Log:
- new, filesonic premium account support
Added: toys/rsget.pl/Premium/FileSonic
==
--- (empty file)
+++ toys/rsget.pl/Premium/FileSonic Wed Apr 13 01:14:24 2011
@@ -0,0 +1,45 @@
+# $Id$
+# Get::FileSonic - Premium file getter plugin for rsget.pl
+#
+# 2011 (c) Przemysław Iskra
+# This program is free software,
+# you may distribute it under GPL v2 or newer.
+
+name: FileSonic
+short: *FS
+web: "http://www.filesonic.com/";
+tos: "http://www.filesonic.com/terms-and-conditions";
+uri: qr{filesonic\.com/file/\d+}
+uri: qr{(?:www\d+\.)?sharingmatrix\.com/file/\d+}
+cookie: fsc.p
+slots: max
+status: OK 2011-04-13
+
+pre:
+ my ($user, $pass);
+ if ( my $s = setting("premium_filesonic") ) {
+ ($user, $pass) = ($s =~ /^(.+?):(.+)/) or die "Premium
user:pass incorrect\n";
+ } else {
+ die "Premium user:pass not given\n";
+ }
+
+unify:
+ return "http://www.filesonic.com/file/$1";
+ if m{/file/(\d+)};
+
+start:
+ GET( $-{_uri} );
+
+ ERROR( "file not found: $1" )
+ if m#.*?\s*(.*?)\s*#s
+ or m#\s*[^<]*?\s*\s*(.*?)\s*#s;
+ ! m#Download (.*?) for free on Filesonic.com#;
+ my $fn = de_ml( $1 );
+ ! m#($STDSIZE)#;
+ INFO( name => $fn, asize => $1 );
+
+ GET( "/user/login", post => { email => $user, redirect => "/", password
=> $pass } );
+
+ DOWNLOAD( $-{_uri} );
+
+# vim: filetype=perl:ts=4:sw=4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin: distfiles/request-handler.pl - print cvs command output on error
Author: sparky Date: Mon Apr 11 20:41:29 2011 GMT
Module: admin Tag: HEAD
Log message:
- print cvs command output on error
Files affected:
admin/distfiles:
request-handler.pl (1.27 -> 1.28)
Diffs:
Index: admin/distfiles/request-handler.pl
diff -u admin/distfiles/request-handler.pl:1.27
admin/distfiles/request-handler.pl:1.28
--- admin/distfiles/request-handler.pl:1.27 Wed Dec 8 20:43:08 2010
+++ admin/distfiles/request-handler.pl Mon Apr 11 22:41:24 2011
@@ -72,9 +72,13 @@
$branch = "-r \"$branch\"" if ($branch ne "");
$specdir = File::Basename::basename($spec,('.spec'));
-if (system("cvs -d :pserver:cvs\@cvs.pld-linux.org:/cvsroot get $branch
\"packages/$specdir/$spec\" >/dev/null 2>&1") != 0) {
+my $cvs_get = `cvs -d :pserver:cvs\@cvs.pld-linux.org:/cvsroot get $branch
"packages/$specdir/$spec" 2>&1`;
+if ( $? ) {
chdir($oldcwd);
- report_fatal("cannot cvs get $spec at $branch")
+ my $at_branch = "";
+ $at_branch = " from branch $branch" if $branch;
+ my $code = $? >> 8;
+ report_fatal("cannot cvs get $spec$at_branch;\n$cvs_get\nexited with code
$code");
}
chdir($oldcwd);
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/request-handler.pl?r1=1.27&r2=1.28&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Curl.pm
Author: sparky
Date: Mon Apr 11 21:53:36 2011
New Revision: 12225
Modified:
toys/rsget.pl/RSGet/Curl.pm
Log:
- use WWW::CurlOO if available
Modified: toys/rsget.pl/RSGet/Curl.pm
==
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Mon Apr 11 21:53:36 2011
@@ -10,6 +10,18 @@
use RSGet::Tools;
use RSGet::Line;
use RSGet::Hook;
+BEGIN {
+ eval { require WWW::CurlOO::Compat; };
+ if ( $@ ) {
+ warn "\nERROR::Could not load WWW::CurlOO::Compat -- " .
+ "will use WWW::Curl instead\n";
+ warn "NOTE: future rsget.pl versions will require WWW::CurlOO
to run,\n" .
+ "so make sure it is available in your operating system
before " .
+ "that happens.\n\n";
+ } else {
+ print "Using WWW::CurlOO, woohoo !\n";
+ }
+}
use WWW::Curl::Easy 4.00;
use WWW::Curl::Multi;
use URI::Escape;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: pygmalion/pygmalion.spec - avoid (%7E == ~) in filename
Author: sparky Date: Wed Mar 30 18:17:40 2011 GMT
Module: packages Tag: HEAD
Log message:
- avoid (%7E == ~) in filename
Files affected:
packages/pygmalion:
pygmalion.spec (1.9 -> 1.10)
Diffs:
Index: packages/pygmalion/pygmalion.spec
diff -u packages/pygmalion/pygmalion.spec:1.9
packages/pygmalion/pygmalion.spec:1.10
--- packages/pygmalion/pygmalion.spec:1.9 Mon Dec 14 01:19:45 2009
+++ packages/pygmalion/pygmalion.spec Wed Mar 30 20:17:35 2011
@@ -8,7 +8,7 @@
Release: 0.2
License: GPL
Group: X11/Applications
-Source0:
http://dl.sourceforge.net/pygmalion3d/%7EPygmalion-%{version}.tar.gz
+Source0:
http://downloads.sourceforge.net/pygmalion3d/%7EPygmalion-%{version}.tar.gz#/%{name}-%{version}.tar.gz
# Source0-md5: 2b0db1f647628288192fadf9b4eacf4c
Patch0:%{name}-typos.patch
Patch1:%{name}-makefile.patch
@@ -77,6 +77,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.10 2011/03/30 18:17:35 sparky
+- avoid (%7E == ~) in filename
+
Revision 1.9 2009/12/14 00:19:45 sparky
- don't repeat %docs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pygmalion/pygmalion.spec?r1=1.9&r2=1.10&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pygmalion: pygmalion-0.4.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/pygmalion3d/%7EPygmalion-0.4.tar.gz#/pygmalion-0.4.tar.gz 2b0db1f647628288192fadf9b4eacf4c pygmalion-0.4.tar.gz Size: 161039 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
admin: distfiles/file-fetcher.pl - refuse filenames with escape codes (%20, ...
Author: sparky Date: Wed Mar 30 18:15:00 2011 GMT
Module: admin Tag: HEAD
Log message:
- refuse filenames with escape codes (%20, %7E)
Files affected:
admin/distfiles:
file-fetcher.pl (1.56 -> 1.57)
Diffs:
Index: admin/distfiles/file-fetcher.pl
diff -u admin/distfiles/file-fetcher.pl:1.56
admin/distfiles/file-fetcher.pl:1.57
--- admin/distfiles/file-fetcher.pl:1.56Wed Dec 8 20:54:45 2010
+++ admin/distfiles/file-fetcher.pl Wed Mar 30 20:14:55 2011
@@ -231,6 +231,13 @@
push @files, $bn;
+ if ( $bn =~ m/(%[0-9a-f]{2})/i ) {
+$problems .= "$bn: refusing to download file with uri escape codes ($1) in
the name\n";
+$bn =~ s/%[0-9a-f]{2}/_/g;
+$problems .= "HINT: use $url#/$bn as source to rename the file\n\n";
+return;
+ }
+
if (got_on_distfiles($md5, $url)) {
$normal_out .=
"ALREADY GOT: $url\n" .
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/admin/distfiles/file-fetcher.pl?r1=1.56&r2=1.57&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ca-certificates: ca-certificates_20090814+nmu3.tar.gz thawte-roots.zip CA.pem level1.pem level2.pem level3.pem level4.pem vs.pem na.pem tsa.pem ...
Files fetched: 0 ALREADY GOT: ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/ca-certificates_20090814+nmu3.tar.gz 578be1c5a459cea3b243777c08610727 ca-certificates_20090814+nmu3.tar.gz ALREADY GOT: https://www.verisign.com/support/thawte-roots.zip a3709cc0279ef3fca4f86ea775066b18 thawte-roots.zip ALREADY GOT: http://www.certum.pl/keys/CA.pem 35610177afc9c64e70f1ce62c1885496 CA.pem ALREADY GOT: http://www.certum.pl/keys/level1.pem ba2d2e234ef9cfd2e6e5f810c964862e level1.pem ALREADY GOT: http://www.certum.pl/keys/level2.pem d06578a04e8cb23071f3870430ea0cf0 level2.pem ALREADY GOT: http://www.certum.pl/keys/level3.pem 47b67c63a52236576fc0d1150327c962 level3.pem ALREADY GOT: http://www.certum.pl/keys/level4.pem f1f8a65d177745311a1e99f029ae5d71 level4.pem ALREADY GOT: http://www.certum.pl/keys/vs.pem 8da19ffc48c5dcc2868b1aa55f1d5983 vs.pem ALREADY GOT: http://www.certum.pl/keys/na.pem ba571cb35e7672ff7ae95132ac1bfec4 na.pem ALREADY GOT: http://www.certum.pl/keys/tsa.pem 1a7b3faf8ed00f4d80297de74862e102 tsa.pem ALREADY GOT: http://www.certum.pl/keys/class1.pem 058436b132ea2df6972821f546104a16 class1.pem ALREADY GOT: http://www.certum.pl/keys/class2.pem 5caf7fe99b1fc6e63c40b3d081711d1b class2.pem ALREADY GOT: http://www.certum.pl/keys/class3.pem 07bc97e21da092ba53535c7379e1b58b class3.pem ALREADY GOT: http://www.certum.pl/keys/class4.pem 99ef61d509539af89f1c025b67245965 class4.pem ALREADY GOT: http://crt.tcs.terena.org/TERENASSLCA.crt f62cd1546a8ef14e31ba1ce8eecd234a TERENASSLCA.crt ALREADY GOT: http://crt.tcs.terena.org/TERENAeScienceSSLCA.crt 5feea35ab01a373f115219706f1f57bd TERENAeScienceSSLCA.crt ALREADY GOT: http://crt.tcs.terena.org/TERENAPersonalCA.crt 53eaa497c8fb0b79f14fe9f69693689a TERENAPersonalCA.crt ALREADY GOT: http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt e25cc655d3ebe920ca9c187e3dde9191 TERENAeSciencePersonalCA.crt ALREADY GOT: http://crt.tcs.terena.org/TERENACodeSigningCA.crt 74c9f511ab03a4e6b7462e310abfa89b TERENACodeSigningCA.crt ALREADY GOT: http://www.sk.ee/upload/files/JUUR-SK.PEM.cer 805784c06c9eff3771a4b9bd631cd3f5 JUUR-SK.PEM.cer ALREADY GOT: http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer 387beee5b8539ab7d91628f486295899 ESTEID-SK.PEM.cer ALREADY GOT: http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer 2b1a2a77f565d68fdf5f19f6cc3a5600 ESTEID-SK%202007.PEM.cer ALREADY GOT: http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer cfcc1e592cb0ff305158a7e32730546c ESTEID-SK%202011.pem.cer -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: ideviceinstaller/ideviceinstaller.spec - run libtoolize before ac...
Author: sparky Date: Sun Mar 27 20:15:34 2011 GMT
Module: packages Tag: HEAD
Log message:
- run libtoolize before aclocal (it updated m4 macros)
Files affected:
packages/ideviceinstaller:
ideviceinstaller.spec (1.5 -> 1.6)
Diffs:
Index: packages/ideviceinstaller/ideviceinstaller.spec
diff -u packages/ideviceinstaller/ideviceinstaller.spec:1.5
packages/ideviceinstaller/ideviceinstaller.spec:1.6
--- packages/ideviceinstaller/ideviceinstaller.spec:1.5 Sun Mar 27 21:06:08 2011
+++ packages/ideviceinstaller/ideviceinstaller.spec Sun Mar 27 22:15:29 2011
@@ -28,8 +28,8 @@
%{__sed} -i -e 's/-Werror//' configure.ac
%build
-%{__aclocal} -I m4
%{__libtoolize}
+%{__aclocal} -I m4
%{__autoheader}
%{__automake}
%{__autoconf}
@@ -56,6 +56,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.6 2011/03/27 20:15:29 sparky
+- run libtoolize before aclocal (it updated m4 macros)
+
Revision 1.5 2011/03/27 19:06:08 glen
- up to 1.0.0
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ideviceinstaller/ideviceinstaller.spec?r1=1.5&r2=1.6&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec - BR: iconv
Author: sparky Date: Sat Mar 26 12:47:57 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: iconv
Files affected:
packages/fonts-OTF-Aegyptus:
fonts-OTF-Aegyptus.spec (1.4 -> 1.5)
Diffs:
Index: packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec
diff -u packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec:1.4
packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec:1.5
--- packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec:1.4 Wed Feb 10
11:10:57 2010
+++ packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec Sat Mar 26 13:47:52 2011
@@ -10,6 +10,7 @@
Source0: http://users.teilar.gr/~g1951d/Aegyptus%{_ver}.zip
# Source0-md5: de9426b4fbed2ce23d6121effce36ba9
URL: http://users.teilar.gr/~g1951d/
+BuildRequires: iconv
BuildRequires: unzip
Requires(post,postun): fontpostinst
BuildArch: noarch
@@ -66,6 +67,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.5 2011/03/26 12:47:52 sparky
+- BR: iconv
+
Revision 1.4 2010/02/10 10:10:57 ankry
- convert docs to utf8
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/fonts-OTF-Aegyptus/fonts-OTF-Aegyptus.spec?r1=1.4&r2=1.5&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Video/YouTube
Author: sparky
Date: Fri Mar 25 20:13:23 2011
New Revision: 12216
Modified:
toys/rsget.pl/Video/YouTube
Log:
- updated
Modified: toys/rsget.pl/Video/YouTube
==
--- toys/rsget.pl/Video/YouTube (original)
+++ toys/rsget.pl/Video/YouTube Fri Mar 25 20:13:23 2011
@@ -1,7 +1,7 @@
# $Id$
# Video::YouTube - Video getter plugin for rsget.pl
#
-# 2009-2010 (c) Przemysław Iskra
+# 2009-2011 (c) Przemysław Iskra
# This program is free software,
# you may distribute it under GPL v2 or newer.
@@ -10,7 +10,7 @@
web: "http://www.youtube.com/";
uri: qr{youtube\.com/watch\?v=.*}
slots: max
-status: OK 2010-07-22
+status: OK 2011-03-25
unify:
s/#.*//;
@@ -81,6 +81,7 @@
/"fmt_url_map": "(.*?)"/;
my %uri = map /(\d+)\|(.*)/, split /,/, $1;
my $uri = $uri{ $fmt->[0] };
+ $uri =~ s#\\u0026#&#g;
$uri =~ s#\\/#/#g;
$-{file_uri} = uri_unescape( $uri );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/UlozTo
Author: sparky
Date: Sun Mar 6 14:34:34 2011
New Revision: 12194
Modified:
toys/rsget.pl/Get/UlozTo
Log:
- updated/fixed
Modified: toys/rsget.pl/Get/UlozTo
==
--- toys/rsget.pl/Get/UlozTo(original)
+++ toys/rsget.pl/Get/UlozToSun Mar 6 14:34:34 2011
@@ -23,7 +23,7 @@
! m{(.*?)};
my $name = $1;
- ! m{(?:[\d:]+\s*\|\s*)?($STDSIZE)}o;
+ ! m{\s*\s*(?:[\d:]+\s*\|\s*)?($STDSIZE)\s*\s*}os;
INFO( name => $name, asize => $1 );
! $-{form} = $self->form( name => "dwn" );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: linphone/linphone.spec - link with -lXext to fix linking - BR: gt...
Author: sparky Date: Sat Mar 5 17:16:52 2011 GMT
Module: packages Tag: HEAD
Log message:
- link with -lXext to fix linking
- BR: gtk+2-devel, intltool, libv4l-devel, ncurses-devel, pulseaudio-devel,
readline-devel, xorg-lib-libXv-devel
- dropped no longer used BR: a52dec-libs-devel, gnome-panel-devel, gtk-doc,
libgnomeui-devel, lpc10-devel
Files affected:
packages/linphone:
linphone.spec (1.51 -> 1.52)
Diffs:
Index: packages/linphone/linphone.spec
diff -u packages/linphone/linphone.spec:1.51
packages/linphone/linphone.spec:1.52
--- packages/linphone/linphone.spec:1.51Sat Mar 5 17:55:08 2011
+++ packages/linphone/linphone.spec Sat Mar 5 18:16:47 2011
@@ -15,28 +15,30 @@
Source0:
http://download.savannah.gnu.org/releases/linphone/stable/sources//%{name}-%{version}.tar.gz
# Source0-md5: aaa5bb7c60d7cab2b1a63a1a42535d38
URL: http://www.linphone.org/
-BuildRequires: a52dec-libs-devel
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: ffmpeg-devel >= 0.4.5
BuildRequires: gettext-devel
BuildRequires: gnome-common >= 2.8.0
-BuildRequires: gnome-panel-devel
-BuildRequires: gtk-doc
+BuildRequires: gtk+2-devel
+BuildRequires: intltool
BuildRequires: jack-audio-connection-kit-devel >= 0.15.0
BuildRequires: libeXosip2-devel
-BuildRequires: libgnomeui-devel
BuildRequires: libgsm-devel >= 1.0.10
BuildRequires: libosip2-devel >= 2.2.0
BuildRequires: libsamplerate-devel >= 0.0.13
BuildRequires: libtool >= 1:1.4.2-9
-BuildRequires: lpc10-devel >= 1.5
+BuildRequires: libv4l-devel
+BuildRequires: ncurses-devel
BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
+BuildRequires: readline-devel
BuildRequires: rpmbuild(macros) >= 1.98
BuildRequires: scrollkeeper
BuildRequires: speex-devel >= 1.0.0
BuildRequires: srtp-devel
+BuildRequires: xorg-lib-libXv-devel
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): /usr/bin/scrollkeeper-update
Provides: ortp = 0.14.2
@@ -116,6 +118,7 @@
%{__autoheader}
%{__automake}
%configure \
+ LIBS="-lXext" \
--with-html-dir=%{_gtkdocdir} \
--enable-alsa \
--enable-ipv6
@@ -191,6 +194,13 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.52 2011/03/05 17:16:47 sparky
+- link with -lXext to fix linking
+- BR: gtk+2-devel, intltool, libv4l-devel, ncurses-devel, pulseaudio-devel,
+ readline-devel, xorg-lib-libXv-devel
+- dropped no longer used BR: a52dec-libs-devel, gnome-panel-devel, gtk-doc,
+ libgnomeui-devel, lpc10-devel
+
Revision 1.51 2011/03/05 16:55:08 pawelz
- up to 3.4.2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.51&r2=1.52&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Curl.pm
Author: sparky
Date: Sat Mar 5 01:20:40 2011
New Revision: 12191
Modified:
toys/rsget.pl/RSGet/Curl.pm
Log:
- get download speed from curl, don't calculate manually
Modified: toys/rsget.pl/RSGet/Curl.pm
==
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Sat Mar 5 01:20:40 2011
@@ -482,6 +482,7 @@
my $get_obj = $supercurl->{get_obj};
delete $supercurl->{get_obj};
+ $supercurl->{speed_end} = $curl->getinfo( CURLINFO_SPEED_DOWNLOAD );
if ( $supercurl->{file} ) {
close $supercurl->{file};
$get_obj->print( "DONE " . donemsg( $supercurl ) );
@@ -608,7 +609,6 @@
}
}
-my $avg_speed = 0;
sub update_status
{
my $time = time;
@@ -642,12 +642,9 @@
next;
}
- my $speed = "???";
- if ( $time_diff > 0 ) {
- my $s = $size_diff / ( $time_diff * 1024 );
- $speed = sprintf "%.2f", $s;
- $total_speed += $s;
- }
+ my $s = $supercurl->{curl}->getinfo( CURLINFO_SPEED_DOWNLOAD )
/ 1024;
+ my $speed = sprintf "%.2f", $s;
+ $total_speed += $s;
my $eta = "";
if ( $size_total > 0 and $time_diff > 0 and $size_diff > 0 ) {
@@ -658,12 +655,11 @@
$supercurl->{get_obj}->print( "$size; ${speed}KB/s$eta" );
}
- $avg_speed = ($avg_speed * 9 + $total_speed) / 10;
my $running = scalar keys %active_curl;
RSGet::Line::status(
'running cURL' => $running,
- 'total speed' => ( sprintf '%.2fKB/s', $avg_speed )
+ 'total speed' => ( sprintf '%.2fKB/s', $total_speed )
);
return;
}
@@ -672,11 +668,10 @@
{
my $supercurl = shift;
- my $size_diff = $supercurl->{size_got} - $supercurl->{size_start};
my $time_diff = time() - $supercurl->{time_start};
$time_diff = 1 unless $time_diff;
my $eta = s2string( $time_diff );
- my $speed = sprintf "%.2f", $size_diff / ( $time_diff * 1024 );
+ my $speed = sprintf "%.2f", $supercurl->{speed_end} / 1024;
return bignum( $supercurl->{size_got} ) . "; ${speed}KB/s $eta";
}
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet: Get.pm Processor.pm
Author: sparky
Date: Fri Mar 4 18:30:56 2011
New Revision: 12190
Modified:
toys/rsget.pl/RSGet/Get.pm
toys/rsget.pl/RSGet/Processor.pm
Log:
- dump data if download is html
Modified: toys/rsget.pl/RSGet/Get.pm
==
--- toys/rsget.pl/RSGet/Get.pm (original)
+++ toys/rsget.pl/RSGet/Get.pm Fri Mar 4 18:30:56 2011
@@ -353,6 +353,16 @@
RSGet::Dispatch::finished( $self );
}
+sub is_html
+{
+ my $self = shift;
+
+ if ( $self->{body} and setting( "debug" ) ) {
+ $self->dump();
+ }
+ return $self->delay( 15 * 60, 'download is an HTML page' );
+}
+
sub abort
{
my $self = shift;
Modified: toys/rsget.pl/RSGet/Processor.pm
==
--- toys/rsget.pl/RSGet/Processor.pm(original)
+++ toys/rsget.pl/RSGet/Processor.pmFri Mar 4 18:30:56 2011
@@ -37,7 +37,7 @@
if ( $last_cmd and $last_cmd =~ /(?:click_)?download/ ) {
$last_cmd = undef;
- pr "\treturn \${self}->delay( 15 * 60, 'download is an HTML
page' );\n}\n";
+ pr "\treturn \${self}->is_html();\n}\n";
return;
}
$last_cmd = undef;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileServe
Author: sparky
Date: Fri Mar 4 18:30:09 2011
New Revision: 12189
Modified:
toys/rsget.pl/Get/FileServe
Log:
- more fixes
Modified: toys/rsget.pl/Get/FileServe
==
--- toys/rsget.pl/Get/FileServe (original)
+++ toys/rsget.pl/Get/FileServe Fri Mar 4 18:30:09 2011
@@ -36,13 +36,13 @@
! m{src="(/landing/.+?/download_captcha\.js)"};
$-{captcha_uri} = $1;
- CLICK( "", post => { checkDownload => "check" } );
+ CLICK( "", post => { checkDownload => "check" }, keep_referer => 1 );
MULTI() if /{"fail":"parallelDownload"}/;
RESTART( 900, "free limit reached" ) if /{"fail":"timeLimit"}/;
ERROR( "some error: $_" ) if /{"fail"/;
- ERROR( "some error" ) unless /{"success":"showCaptcha"}/;
+ ! /{"success":"showCaptcha"}/;
GET( $-{captcha_uri}, keep_referer => 1,
headers => [ "X-Requested-With: XMLHttpRequest" ] );
@@ -68,16 +68,16 @@
recaptcha_challenge_field => $-{captcha_challenge},
}, keep_referer => 1 );
- if ( /incorrect-captcha-sol/ ) {
+ if ( /{"success":1}/ ) {
+ CAPTCHA_RESULT( "OK" );
+ } else {
CAPTCHA_RESULT( "FAIL" );
GOTO stage_getcaptcha;
- } else {
- CAPTCHA_RESULT( "OK" );
}
GET( "", post => { downloadLink => "wait" }, keep_referer => 1 );
- ! /(\d+)/;
+ ! /^\xef\xbb\xbf(\d+)$/s;
WAIT( -$1, "expecting download link" );
CLICK( "", post => { downloadLink => "show" }, keep_referer => 1, );
@@ -90,4 +90,10 @@
RESTART( 1, "download link expired" )
if /Your download link has expired/;
+ RESTART( 60, "captcha error, this shouldn't happen" )
+ if /Captcha error/;
+
+ RESTART( 1, "multi download not allowed" )
+ if m{URL=http://www\.fileserve\.com/landing-1403\.php};
+
# vim: filetype=perl:ts=4:sw=4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Curl.pm
Author: sparky
Date: Fri Mar 4 03:33:26 2011
New Revision: 12187
Modified:
toys/rsget.pl/RSGet/Curl.pm
Log:
- better dead-interface detection
Modified: toys/rsget.pl/RSGet/Curl.pm
==
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Fri Mar 4 03:33:26 2011
@@ -501,7 +501,7 @@
#warn "error($err): $error\n";
$get_obj->linecolor( "red" );
$get_obj->print( "ERROR($err): $error" ) if $err ne "aborted";
- if ( $error =~ /Couldn't bind to '(.*)'/ or $error =~ /bind
failed/ ) {
+ if ( $error =~ /Couldn't bind to '|bind failed|Could not
resolve host:|Connection timed out after \d+ milliseconds/ ) {
my $if = $get_obj->{_outif};
RSGet::Dispatch::remove_interface( $if, "Interface $if
is dead" );
$get_obj->{_abort} = "Interface $if is dead";
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet: Curl.pm Get.pm
Author: sparky
Date: Fri Mar 4 01:22:08 2011
New Revision: 12186
Modified:
toys/rsget.pl/RSGet/Curl.pm
toys/rsget.pl/RSGet/Get.pm
Log:
- colorize more messages
Modified: toys/rsget.pl/RSGet/Curl.pm
==
--- toys/rsget.pl/RSGet/Curl.pm (original)
+++ toys/rsget.pl/RSGet/Curl.pm Fri Mar 4 01:22:08 2011
@@ -499,6 +499,7 @@
if ( $err ) {
#warn "error($err): $error\n";
+ $get_obj->linecolor( "red" );
$get_obj->print( "ERROR($err): $error" ) if $err ne "aborted";
if ( $error =~ /Couldn't bind to '(.*)'/ or $error =~ /bind
failed/ ) {
my $if = $get_obj->{_outif};
@@ -512,7 +513,6 @@
} elsif ( $err eq "aborted" ) {
} else {
- $get_obj->linecolor( "red" );
$get_obj->log( "ERROR($err): $error" );
}
$get_obj->problem();
Modified: toys/rsget.pl/RSGet/Get.pm
==
--- toys/rsget.pl/RSGet/Get.pm (original)
+++ toys/rsget.pl/RSGet/Get.pm Fri Mar 4 01:22:08 2011
@@ -332,6 +332,7 @@
my $until = $time + time;
$msg = "Delayed until " . localtime( $until ) . ": " . $msg;
+ $self->linecolor( "orange" );
$self->print( $msg ) || $self->log( $msg );
RSGet::FileList::save( $self->{_uri}, options => { delay => $until,
error => $msg, delay_last => $time } );
RSGet::Dispatch::finished( $self );
@@ -367,6 +368,7 @@
$self->dump();
}
+ $self->linecolor( "red" );
$self->print( $msg ) || $self->log( $msg );
RSGet::FileList::save( $self->{_uri}, options => { error => $msg } );
RSGet::Dispatch::finished( $self );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileServe
Author: sparky
Date: Fri Mar 4 01:20:25 2011
New Revision: 12185
Modified:
toys/rsget.pl/Get/FileServe
Log:
- improvemed, but there are problems yet
Modified: toys/rsget.pl/Get/FileServe
==
--- toys/rsget.pl/Get/FileServe (original)
+++ toys/rsget.pl/Get/FileServe Fri Mar 4 01:20:25 2011
@@ -41,7 +41,8 @@
MULTI() if /{"fail":"parallelDownload"}/;
RESTART( 900, "free limit reached" ) if /{"fail":"timeLimit"}/;
- ERROR( "some error: $_" ) unless /{"success":"showCaptcha"}/;
+ ERROR( "some error: $_" ) if /{"fail"/;
+ ERROR( "some error" ) unless /{"success":"showCaptcha"}/;
GET( $-{captcha_uri}, keep_referer => 1,
headers => [ "X-Requested-With: XMLHttpRequest" ] );
@@ -77,13 +78,16 @@
GET( "", post => { downloadLink => "wait" }, keep_referer => 1 );
! /(\d+)/;
- WAIT( $1, "expecting download link" );
+ WAIT( -$1, "expecting download link" );
CLICK( "", post => { downloadLink => "show" }, keep_referer => 1, );
CLICK_DOWNLOAD( "", post => { download => "normal" } );
- RESTART( $1, "free limit reached" )
+ RESTART( 1, "free limit reached" )
if m#You need to wait (\d+) seconds to start another
download\.#;
+ RESTART( 1, "download link expired" )
+ if /Your download link has expired/;
+
# vim: filetype=perl:ts=4:sw=4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/data/main.js
Author: sparky
Date: Thu Mar 3 21:49:37 2011
New Revision: 12184
Modified:
toys/rsget.pl/data/main.js
Log:
- don't be so annoying when asking for captcha
Modified: toys/rsget.pl/data/main.js
==
--- toys/rsget.pl/data/main.js (original)
+++ toys/rsget.pl/data/main.js Thu Mar 3 21:49:37 2011
@@ -106,7 +106,17 @@
al = 1;
}
if ( al )
- alert( "Assist needed" );
+ window.setTimeout( ask_for_help, 500 );
+}
+
+var assist_alert = 0;
+function ask_for_help()
+{
+ if ( assist_alert )
+ return;
+ assist_alert = 1;
+ alert( "Please, solve captcha" );
+ assist_alert = 0;
}
function add_DL_commands( list )
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Get.pm
Author: sparky
Date: Thu Mar 3 04:06:13 2011
New Revision: 12182
Modified:
toys/rsget.pl/RSGet/Get.pm
Log:
- multi() will delay if called too many times
Modified: toys/rsget.pl/RSGet/Get.pm
==
--- toys/rsget.pl/RSGet/Get.pm (original)
+++ toys/rsget.pl/RSGet/Get.pm Thu Mar 3 04:06:13 2011
@@ -315,7 +315,11 @@
{
my $self = shift;
my $msg = shift || "multi-download not allowed";
- return $self->wait( \&start, - irand( 60, 300 ), $msg, "multi" );
+ if ( ++$self->{_try} < 4 ) {
+ return $self->wait( \&start, - irand( 30, 120 ), $msg, "multi"
);
+ } else {
+ return $self->delay( 300, $msg );
+ }
}
# TODO: make delay interface-aware
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileServe
Author: sparky
Date: Thu Mar 3 04:01:17 2011
New Revision: 12181
Modified:
toys/rsget.pl/Get/FileServe
Log:
- detect parallel download early
Modified: toys/rsget.pl/Get/FileServe
==
--- toys/rsget.pl/Get/FileServe (original)
+++ toys/rsget.pl/Get/FileServe Thu Mar 3 04:01:17 2011
@@ -38,6 +38,7 @@
CLICK( "", post => { checkDownload => "check" } );
+ MULTI() if /{"fail":"parallelDownload"}/;
RESTART( 900, "free limit reached" ) if /{"fail":"timeLimit"}/;
ERROR( "some error: $_" ) unless /{"success":"showCaptcha"}/;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileFactory
Author: sparky
Date: Thu Mar 3 02:04:58 2011
New Revision: 12180
Modified:
toys/rsget.pl/Get/FileFactory
Log:
- wait what's needed
Modified: toys/rsget.pl/Get/FileFactory
==
--- toys/rsget.pl/Get/FileFactory (original)
+++ toys/rsget.pl/Get/FileFactory Thu Mar 3 02:04:58 2011
@@ -67,7 +67,7 @@
$-{file_uri} = $1;
! m#http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileSonic
Author: sparky
Date: Thu Mar 3 01:20:16 2011
New Revision: 12179
Modified:
toys/rsget.pl/Get/FileSonic
Log:
- fixed multi-download detection
Modified: toys/rsget.pl/Get/FileSonic
==
--- toys/rsget.pl/Get/FileSonic (original)
+++ toys/rsget.pl/Get/FileSonic Thu Mar 3 01:20:16 2011
@@ -34,7 +34,8 @@
$-{dl_start} = $1;
CLICK( $-{dl_start}, headers => [ "X-Requested-With: XMLHttpRequest" ],
post => "", keep_referer => 1 );
- MULTI() if m#Download session in progress#;
+ MULTI() if m#Download session in progress#
+ or m#Free users may only download 1 file at a time\.#;
( $-{file_uri} ) = m{Start download
now!};
GOTO stage_download if $-{file_uri};
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileServe
Author: sparky
Date: Thu Mar 3 01:03:56 2011
New Revision: 12178
Modified:
toys/rsget.pl/Get/FileServe
Log:
- improved: don't ask the captcha if we must wait anyways
Modified: toys/rsget.pl/Get/FileServe
==
--- toys/rsget.pl/Get/FileServe (original)
+++ toys/rsget.pl/Get/FileServe Thu Mar 3 01:03:56 2011
@@ -2,6 +2,7 @@
# Get::FileServe - File getter plugin for rsget.pl
#
# 2010 (c) Paweł Zuzelski
+# 2011 (c) Przemysław Iskra
# This program is free software,
# you may distribute it under GPL v2 or newer.
@@ -11,7 +12,7 @@
tos: "http://fileserve.com/terms.php";
uri: qr{fileserve\.com/file/[A-Za-z0-9]+(/.*)?}
cookie: fsrv
-status: OK 2010-12-19
+status: OK 2011-03-03
unify:
s/#.*//;
@@ -33,7 +34,15 @@
! ( $-{captcha_encode} ) = m{"recaptcha_shortencode_field".*?
value="(.*?)" />};
! m{src="(/landing/.+?/download_captcha\.js)"};
- CLICK( $1, keep_referer => 1,
+ $-{captcha_uri} = $1;
+
+ CLICK( "", post => { checkDownload => "check" } );
+
+ RESTART( 900, "free limit reached" ) if /{"fail":"timeLimit"}/;
+
+ ERROR( "some error: $_" ) unless /{"success":"showCaptcha"}/;
+
+ GET( $-{captcha_uri}, keep_referer => 1,
headers => [ "X-Requested-With: XMLHttpRequest" ] );
stage_getcaptcha:
@@ -67,7 +76,7 @@
GET( "", post => { downloadLink => "wait" }, keep_referer => 1 );
! /(\d+)/;
- WAIT( $1, "expecting for download link" );
+ WAIT( $1, "expecting download link" );
CLICK( "", post => { downloadLink => "show" }, keep_referer => 1, );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/FileSonic
Author: sparky
Date: Wed Mar 2 22:10:51 2011
New Revision: 12177
Modified:
toys/rsget.pl/Get/FileSonic
Log:
- improved
Modified: toys/rsget.pl/Get/FileSonic
==
--- toys/rsget.pl/Get/FileSonic (original)
+++ toys/rsget.pl/Get/FileSonic Wed Mar 2 22:10:51 2011
@@ -1,7 +1,7 @@
# $Id$
# Get::FileSonic - File getter plugin for rsget.pl
#
-# 2010 (c) Przemysław Iskra
+# 2010-2011 (c) Przemysław Iskra
# This program is free software,
# you may distribute it under GPL v2 or newer.
@@ -12,7 +12,7 @@
uri: qr{filesonic\.com/file/\d+}
uri: qr{(?:www\d+\.)?sharingmatrix\.com/file/\d+}
cookie: fsc
-status: OK 2010-12-18
+status: OK 2011-03-02
unify:
return "http://www.filesonic.com/file/$1";
@@ -36,16 +36,26 @@
MULTI() if m#Download session in progress#;
-stage_getlink:
( $-{file_uri} ) = m{Start download
now!};
-
GOTO stage_download if $-{file_uri};
- if ( /var countDownDelay = (\d+);/ ) {
- $-{delay} = $1;
- GOTO stage_wait;
- }
+ GOTO stage_captcha unless /var countDownDelay = (\d+);/;
+ my $wait = $1;
+
+ RESTART( $wait, "download limit" ) if $wait > 300;
+
+ ! / $1 );
+
+! / $-{wait_post} );
+
+stage_captcha:
! m{Recaptcha\.create\("(.*?)"};
$-{captcha_key} = $1;
@@ -68,14 +78,8 @@
recaptcha_response_field => $_
} );
- GOTO stage_getlink;
-
-stage_wait:
- WAIT( -( $-{delay} + 5 ), "expecting download link" );
-
- GET( $-{dl_start}, post => "" );
-
- GOTO stage_getlink;
+ ! m{Start download now!};
+ $-{file_uri} = $1;
stage_download:
CLICK_DOWNLOAD( $-{file_uri} );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/Get/DepositFiles
Author: sparky
Date: Wed Mar 2 21:34:18 2011
New Revision: 12176
Modified:
toys/rsget.pl/Get/DepositFiles
Log:
- fixed / updated
Modified: toys/rsget.pl/Get/DepositFiles
==
--- toys/rsget.pl/Get/DepositFiles (original)
+++ toys/rsget.pl/Get/DepositFiles Wed Mar 2 21:34:18 2011
@@ -1,7 +1,7 @@
# $Id$
# Get::DepositFiles - File getter plugin for rsget.pl
#
-# 2009-2010 (c) Przemysław Iskra
+# 2009-2011 (c) Przemysław Iskra
# This program is free software,
# you may distribute it under GPL v2 or newer.
@@ -9,7 +9,7 @@
short: DF
web: "http://depositfiles.com/";
uri: qr{depositfiles\.com/(../)?files/[0-9a-z]+}
-status: OK 2010-07-13
+status: OK 2011-03-02
unify:
return "http://depositfiles.com/files/$1"; if m#/files/([0-9a-z]+)#;
@@ -29,16 +29,26 @@
$-{dl_form} = $self->form( match => { onsubmit => qr/^download_started/
} );
GOTO stage_download if $-{dl_form};
- ! my $form = $self->form( match => { body => qr/name="gateway_result"/
} );
+ ! my $form = $self->form( match => { onsubmit => qr/^show_begin_popup/
} );
CLICK( $form->post() );
RESTART( $1, "free limit reached" )
if m#(\d+)#;
MULTI() if m##;
- $-{dl_form} = $self->form( match => { onsubmit => qr/^download_started/
} );
- WAIT( 60, "starting download" );
+ ! m#setTimeout\('load_form\(\)', (\d+)\);#;
+ my $wait = $1 / 1000;
+
+ ! m/\$\('#download_container'\)\.load\('(.*?)'\);/;
+ $-{dl_link} = $1;
+
+ WAIT( $wait, "starting download" );
+
+ CLICK( $-{dl_link} );
+
+ $-{dl_form} = $self->form( match => { onsubmit => qr/^download_started/
} );
+ GOTO stage_download if $-{dl_form};
stage_download:
CLICK_DOWNLOAD( $-{dl_form}->post() );
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec - updated to...
Author: sparky Date: Fri Feb 25 18:27:17 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated to: 0.20
Files affected:
packages/perl-Socket-GetAddrInfo:
perl-Socket-GetAddrInfo.spec (1.5 -> 1.6)
Diffs:
Index: packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec
diff -u packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.5
packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.6
--- packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.5 Fri Feb
25 19:03:47 2011
+++ packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec Fri Feb
25 19:27:12 2011
@@ -9,22 +9,18 @@
Summary: Socket::GetAddrInfo - RFC 2553's getaddrinfo and getnameinfo
functions
#Summary(pl.UTF-8):
Name: perl-Socket-GetAddrInfo
-Version: 0.15
-Release: 2
+Version: 0.20
+Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0:
http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-%{version}.tar.gz
-# Source0-md5: a2dfcbc44b7e4b24dd0e6ac0996eb4b8
+# Source0-md5: 6fd3dc7f0ce9ca20a540372711533472
URL: http://search.cpan.org/dist/Socket-GetAddrInfo/
-BuildRequires: perl-ExtUtils-CChecker
+BuildRequires: perl-ExtUtils-CChecker >= 0.06
+%{?with_tests:BuildRequires: perl-Test-Pod}
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
-%if %{with tests}
-BuildRequires: perl-Test-Exception
-BuildRequires: perl-Test-Pod
-BuildRequires: perl-Test-Warn
-%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -73,9 +69,6 @@
./Build install
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -88,8 +81,12 @@
%dir %{perl_vendorarch}/auto/Socket/GetAddrInfo
%{perl_vendorarch}/auto/Socket/GetAddrInfo/*.bs
%attr(755,root,root) %{perl_vendorarch}/auto/Socket/GetAddrInfo/*.so
+%dir %{perl_vendorarch}/Socket/GetAddrInfo
+%{perl_vendorarch}/Socket/GetAddrInfo/*.pm
%{_mandir}/man3/*
-%{_examplesdir}/%{name}-%{version}
+%{_mandir}/man1/get*info.*
+%attr(755,root,root) %{_bindir}/getaddrinfo
+%attr(755,root,root) %{_bindir}/getnameinfo
%definedate%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -97,6 +94,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.6 2011/02/25 18:27:12 sparky
+- updated to: 0.20
+
Revision 1.5 2011/02/25 18:03:47 sparky
- BR: perl-Test-Pod
@@ -113,4 +113,3 @@
Revision 1.1 2009/10/27 19:38:20 amateja
- initial
-
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec?r1=1.5&r2=1.6&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-Socket-GetAddrInfo: Socket-GetAddrInfo-0.20.tar.gz
Files fetched: 1 STORED: http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Socket-GetAddrInfo-0.20.tar.gz 6fd3dc7f0ce9ca20a540372711533472 Socket-GetAddrInfo-0.20.tar.gz Size: 83492 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec - updated to: ...
Author: sparky Date: Fri Feb 25 18:16:05 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated to: 0.06
Files affected:
packages/perl-ExtUtils-CChecker:
perl-ExtUtils-CChecker.spec (1.2 -> 1.3)
Diffs:
Index: packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec
diff -u packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec:1.2
packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec:1.3
--- packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec:1.2 Thu Mar
11 13:59:05 2010
+++ packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec Fri Feb 25
19:16:00 2011
@@ -9,13 +9,13 @@
Summary: ExtUtils::CChecker - configure-time utilities for using C
headers, libraries, or OS features
#Summary(pl.UTF-8):
Name: perl-ExtUtils-CChecker
-Version: 0.03
+Version: 0.06
Release: 1
# same as perl
License: GPL v1+ or Artistic
Group: Development/Languages/Perl
Source0:
http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/ExtUtils-CChecker-%{version}.tar.gz
-# Source0-md5: f2a9da32e70ec32c5b47652e020021d0
+# Source0-md5: 18d0a1a50afd5a8185c03cbed9098e4e
URL: http://search.cpan.org/dist/ExtUtils-CChecker/
BuildRequires: perl-Module-Build
BuildRequires: perl-devel >= 1:5.8.0
@@ -75,6 +75,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.3 2011/02/25 18:16:00 sparky
+- updated to: 0.06
+
Revision 1.2 2010/03/11 12:59:05 sparky
- tests BR: perl-Test-Pod
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-ExtUtils-CChecker/perl-ExtUtils-CChecker.spec?r1=1.2&r2=1.3&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-ExtUtils-CChecker: ExtUtils-CChecker-0.06.tar.gz
Files fetched: 1 STORED: http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.06.tar.gz 18d0a1a50afd5a8185c03cbed9098e4e ExtUtils-CChecker-0.06.tar.gz Size: 19557 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec - BR: perl-T...
Author: sparky Date: Fri Feb 25 18:03:52 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: perl-Test-Pod
Files affected:
packages/perl-Socket-GetAddrInfo:
perl-Socket-GetAddrInfo.spec (1.4 -> 1.5)
Diffs:
Index: packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec
diff -u packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.4
packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.5
--- packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec:1.4 Sun Jun
6 10:41:55 2010
+++ packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec Fri Feb
25 19:03:47 2011
@@ -22,6 +22,7 @@
BuildRequires: rpm-perlprov >= 4.1-13
%if %{with tests}
BuildRequires: perl-Test-Exception
+BuildRequires: perl-Test-Pod
BuildRequires: perl-Test-Warn
%endif
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -96,6 +97,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.5 2011/02/25 18:03:47 sparky
+- BR: perl-Test-Pod
+
Revision 1.4 2010/06/06 08:41:55 arekm
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Socket-GetAddrInfo/perl-Socket-GetAddrInfo.spec?r1=1.4&r2=1.5&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: php/php.spec - don't silent libtool instalation - rearranged lite...
Author: sparky Date: Wed Feb 23 23:38:31 2011 GMT
Module: packages Tag: HEAD
Log message:
- don't silent libtool instalation
- rearranged litespeed build
Files affected:
packages/php:
php.spec (1.918 -> 1.919)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.918 packages/php/php.spec:1.919
--- packages/php/php.spec:1.918 Wed Feb 23 22:33:05 2011
+++ packages/php/php.spec Thu Feb 24 00:38:26 2011
@@ -1861,6 +1861,9 @@
%patch60 -p1
%patch61 -p1
+%{__rm} -r sapi/litespeed
+gzip -dc %{SOURCE15} | tar xf - -C sapi/
+
%if "%{pld_release}" != "ac"
sed -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#'
ext/xmlrpc/config.m4
%endif
@@ -1947,6 +1950,9 @@
%if %{with cgi}
cgi-fcgi
%endif
+%if %{with litespeed}
+litespeed
+%endif
%if %{with fpm}
fpm
%endif
@@ -1956,9 +1962,6 @@
%if %{with apache2}
apxs2
%endif
-%if %{with litespeed}
-litespeed
-%endif
"
for sapi in $sapis; do
: SAPI $sapi
@@ -2126,7 +2129,6 @@
%endif
%if %{with litespeed}
-gzip -dc %{SOURCE15} | tar xf - -C sapi/
%{__make} -f Makefile.litespeed
%endif
@@ -2239,20 +2241,20 @@
# install Apache1 DSO module
%if %{with apache1}
-libtool --silent --mode=install install sapi/apache/libphp5.la
$RPM_BUILD_ROOT%{_libdir}/apache1
+libtool --mode=install install sapi/apache/libphp5.la
$RPM_BUILD_ROOT%{_libdir}/apache1
%endif
# install Apache2 DSO module
%if %{with apache2}
-libtool --silent --mode=install install sapi/apache2handler/libphp5.la
$RPM_BUILD_ROOT%{_libdir}/apache
+libtool --mode=install install sapi/apache2handler/libphp5.la
$RPM_BUILD_ROOT%{_libdir}/apache
%endif
# install litespeed sapi
%if %{with litespeed}
-libtool --silent --mode=install install sapi/litespeed/php
$RPM_BUILD_ROOT%{_sbindir}/php.litespeed
+libtool --mode=install install sapi/litespeed/php
$RPM_BUILD_ROOT%{_sbindir}/php.litespeed
%endif
-libtool --silent --mode=install install libphp_common.la
$RPM_BUILD_ROOT%{_libdir}
+libtool --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
# fix install paths, avoid evil rpaths
sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|"
$RPM_BUILD_ROOT%{_libdir}/libphp_common.la
# better solution?
@@ -2260,7 +2262,7 @@
# install CGI/FCGI
%if %{with cgi}
-libtool --silent --mode=install install sapi/cgi/php-cgi
$RPM_BUILD_ROOT%{_bindir}/php.cgi
+libtool --mode=install install sapi/cgi/php-cgi
$RPM_BUILD_ROOT%{_bindir}/php.cgi
ln -sf php.cgi $RPM_BUILD_ROOT%{_bindir}/php.fcgi
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/php-cgi-fcgi.ini
%endif
@@ -2268,7 +2270,7 @@
# install FCGI PM
%if %{with fpm}
install -d $RPM_BUILD_ROOT{%{_sysconfdir}/fpm.d,%{_sbindir}}
-libtool --silent --mode=install install sapi/fpm/php-fpm
$RPM_BUILD_ROOT%{_sbindir}
+libtool --mode=install install sapi/fpm/php-fpm $RPM_BUILD_ROOT%{_sbindir}
cp -a sapi/fpm/php-fpm.8 $RPM_BUILD_ROOT%{_mandir}/man8
cp -a sapi/fpm/php-fpm.conf $RPM_BUILD_ROOT%{_sysconfdir}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
@@ -2278,7 +2280,7 @@
%endif
# install CLI
-libtool --silent --mode=install install sapi/cli/php
$RPM_BUILD_ROOT%{_bindir}/php.cli
+libtool --mode=install install sapi/cli/php $RPM_BUILD_ROOT%{_bindir}/php.cli
install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
@@ -3163,6 +3165,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.919 2011/02/23 23:38:26 sparky
+- don't silent libtool instalation
+- rearranged litespeed build
+
Revision 1.918 2011/02/23 21:33:05 sparky
- BR: mysql-devel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.918&r2=1.919&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-XML-Stream/perl-XML-Stream.spec - disable tests: require dns...
Author: sparky Date: Wed Feb 23 22:37:18 2011 GMT
Module: packages Tag: HEAD
Log message:
- disable tests: require dns resolver which is not allowed on builders
- tests BR: perl-Encode
Files affected:
packages/perl-XML-Stream:
perl-XML-Stream.spec (1.37 -> 1.38)
Diffs:
Index: packages/perl-XML-Stream/perl-XML-Stream.spec
diff -u packages/perl-XML-Stream/perl-XML-Stream.spec:1.37
packages/perl-XML-Stream/perl-XML-Stream.spec:1.38
--- packages/perl-XML-Stream/perl-XML-Stream.spec:1.37 Wed Feb 23 22:31:34 2011
+++ packages/perl-XML-Stream/perl-XML-Stream.spec Wed Feb 23 23:37:13 2011
@@ -1,7 +1,7 @@
# $Revision$, $Date$
#
# Conditional build:
-%bcond_without tests # do not perform "make test"
+%bcond_withtests # do not perform "make test"
#
%include /usr/lib/rpm/macros.perl
%definepdirXML
@@ -19,6 +19,7 @@
Patch0:%{name}-warnings.patch
URL: http://search.cpan.org/dist/XML-Stream/
%{?with_tests:BuildRequires: perl-Authen-SASL}
+%{?with_tests:BuildRequires: perl-Encode}
BuildRequires: perl-Unicode-String >= 2.06
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
@@ -72,6 +73,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.38 2011/02/23 22:37:13 sparky
+- disable tests: require dns resolver which is not allowed on builders
+- tests BR: perl-Encode
+
Revision 1.37 2011/02/23 21:31:34 areq
- better URL for source
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-XML-Stream/perl-XML-Stream.spec?r1=1.37&r2=1.38&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: php/php.spec - BR: mysql-devel
Author: sparky Date: Wed Feb 23 21:33:10 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: mysql-devel
Files affected:
packages/php:
php.spec (1.917 -> 1.918)
Diffs:
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.917 packages/php/php.spec:1.918
--- packages/php/php.spec:1.917 Tue Jan 25 20:28:22 2011
+++ packages/php/php.spec Wed Feb 23 22:33:05 2011
@@ -197,6 +197,7 @@
BuildRequires: elfutils-devel
#BuildRequires:fcgi-devel
#BuildRequires:flex
+BuildRequires: mysql-devel
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
%if %{with mssql} || %{with sybase_ct}
@@ -3162,6 +3163,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.918 2011/02/23 21:33:05 sparky
+- BR: mysql-devel
+
Revision 1.917 2011/01/25 19:28:22 arekm
- rel 4; sesion R spl due to 'Cannot load module 'session' because required
module 'spl' is not loaded'
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.917&r2=1.918&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Coro/perl-Coro.spec - added kill-blocked-test patch
Author: sparky Date: Mon Feb 21 17:14:56 2011 GMT
Module: packages Tag: HEAD
Log message:
- added kill-blocked-test patch
Files affected:
packages/perl-Coro:
perl-Coro.spec (1.17 -> 1.18)
Diffs:
Index: packages/perl-Coro/perl-Coro.spec
diff -u packages/perl-Coro/perl-Coro.spec:1.17
packages/perl-Coro/perl-Coro.spec:1.18
--- packages/perl-Coro/perl-Coro.spec:1.17 Mon Feb 21 17:39:14 2011
+++ packages/perl-Coro/perl-Coro.spec Mon Feb 21 18:14:51 2011
@@ -17,6 +17,7 @@
Group: Development/Languages/Perl
Source0:
http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/%{pnam}-%{version}.tar.gz
# Source0-md5: 96161bae337944c6bdd2b9b5fb811a6f
+Patch0:kill-blocked-test.patch
URL: http://search.cpan.org/dist/Coro/
BuildRequires: perl-AnyEvent >= 2:5.0
BuildRequires: perl-EV >= 1:3.3
@@ -40,6 +41,7 @@
%prep
%setup -q -n %{pnam}-%{version}
+%patch0 -p1
%build
echo "y" | %{__perl} Makefile.PL \
@@ -82,6 +84,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.18 2011/02/21 17:14:51 sparky
+- added kill-blocked-test patch
+
Revision 1.17 2011/02/21 16:39:14 sparky
- updated BRs
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Coro/perl-Coro.spec?r1=1.17&r2=1.18&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Coro/kill-blocked-test.patch (NEW) - set alarm in unblock te...
Author: sparky Date: Mon Feb 21 17:14:26 2011 GMT Module: packages Tag: HEAD Log message: - set alarm in unblock tests; does not fix the problem, onle avoids deadlock Files affected: packages/perl-Coro: kill-blocked-test.patch (NONE -> 1.1) (NEW) Diffs: Index: packages/perl-Coro/kill-blocked-test.patch diff -u /dev/null packages/perl-Coro/kill-blocked-test.patch:1.1 --- /dev/null Mon Feb 21 18:14:27 2011 +++ packages/perl-Coro/kill-blocked-test.patch Mon Feb 21 18:14:21 2011 @@ -0,0 +1,24 @@ +--- Coro-5.26/EV/t/01_unblock.t~ 2009-07-22 05:02:07.0 +0200 Coro-5.26/EV/t/01_unblock.t2011-02-21 18:01:18.169611668 +0100 +@@ -7,6 +7,9 @@ +} + } + ++# time to die ++alarm 15; ++ + $| = 1; + + print "1..12\n"; +--- Coro-5.26/Event/t/01_unblock.t~2009-07-22 05:02:07.0 +0200 Coro-5.26/Event/t/01_unblock.t 2011-02-21 18:11:37.486278335 +0100 +@@ -7,6 +7,9 @@ +} + } + ++# time to die ++alarm 15; ++ + $| = 1; + + print "1..12\n"; ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-Coro/perl-Coro.spec - updated BRs
Author: sparky Date: Mon Feb 21 16:39:19 2011 GMT
Module: packages Tag: HEAD
Log message:
- updated BRs
Files affected:
packages/perl-Coro:
perl-Coro.spec (1.16 -> 1.17)
Diffs:
Index: packages/perl-Coro/perl-Coro.spec
diff -u packages/perl-Coro/perl-Coro.spec:1.16
packages/perl-Coro/perl-Coro.spec:1.17
--- packages/perl-Coro/perl-Coro.spec:1.16 Sun Feb 20 13:48:41 2011
+++ packages/perl-Coro/perl-Coro.spec Mon Feb 21 17:39:14 2011
@@ -18,9 +18,9 @@
Source0:
http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/%{pnam}-%{version}.tar.gz
# Source0-md5: 96161bae337944c6bdd2b9b5fb811a6f
URL: http://search.cpan.org/dist/Coro/
-BuildRequires: perl-AnyEvent >= 1:2.7
-BuildRequires: perl-Event
-BuildRequires: perl-IO-AIO
+BuildRequires: perl-AnyEvent >= 2:5.0
+BuildRequires: perl-EV >= 1:3.3
+BuildRequires: perl-Event >= 0.89
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
%if %{with tests}
@@ -42,15 +42,13 @@
%setup -q -n %{pnam}-%{version}
%build
-echo "y
-l
-16384" | %{__perl} Makefile.PL \
+echo "y" | %{__perl} Makefile.PL \
INSTALLDIRS=vendor
%{__make} \
CC="%{__cc}" \
OPTIMIZE="%{rpmcflags}"
-%{?with_tests:%{__make} test}
+%{?with_tests:%{__make} -j1 test}
%install
rm -rf $RPM_BUILD_ROOT
@@ -84,6 +82,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.17 2011/02/21 16:39:14 sparky
+- updated BRs
+
Revision 1.16 2011/02/20 12:48:41 arekm
- up to 5.26
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-Coro/perl-Coro.spec?r1=1.16&r2=1.17&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-AnyEvent/perl-AnyEvent.spec - disable debuginfo - release: 4
Author: sparky Date: Mon Feb 21 16:09:19 2011 GMT
Module: packages Tag: HEAD
Log message:
- disable debuginfo
- release: 4
Files affected:
packages/perl-AnyEvent:
perl-AnyEvent.spec (1.21 -> 1.22)
Diffs:
Index: packages/perl-AnyEvent/perl-AnyEvent.spec
diff -u packages/perl-AnyEvent/perl-AnyEvent.spec:1.21
packages/perl-AnyEvent/perl-AnyEvent.spec:1.22
--- packages/perl-AnyEvent/perl-AnyEvent.spec:1.21 Mon Feb 21 17:00:41 2011
+++ packages/perl-AnyEvent/perl-AnyEvent.spec Mon Feb 21 17:09:13 2011
@@ -12,7 +12,7 @@
Summary(pl.UTF-8): AnyEvent - szkielet dla wielu pętli zdarzeń
Name: perl-AnyEvent
Version: 5.31
-Release: 3
+Release: 4
Epoch: 3
# same as perl
License: GPL v1+ or Artistic
@@ -26,6 +26,9 @@
Obsoletes: perl-AnyEvent-Impl-Cocoa
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# disable debuginfo, nothing special there
+%define_enable_debug_packages 0
+
%description
The AnyEvent extension aims to provide an simple and optimized event
loop for a broad class of applications.
@@ -241,6 +244,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.22 2011/02/21 16:09:13 sparky
+- disable debuginfo
+- release: 4
+
Revision 1.21 2011/02/21 16:00:41 qboosh
- pl for Impls
- kill -Impl-Cocoa (OSX-specific)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-AnyEvent/perl-AnyEvent.spec?r1=1.21&r2=1.22&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-AnyEvent/perl-AnyEvent.spec - no longer noarch: 1. installs ...
Author: sparky Date: Mon Feb 21 15:51:19 2011 GMT
Module: packages Tag: HEAD
Log message:
- no longer noarch: 1. installs to archdir and 2. constants.pl may differ
on different archs
- release: 3
Files affected:
packages/perl-AnyEvent:
perl-AnyEvent.spec (1.19 -> 1.20)
Diffs:
Index: packages/perl-AnyEvent/perl-AnyEvent.spec
diff -u packages/perl-AnyEvent/perl-AnyEvent.spec:1.19
packages/perl-AnyEvent/perl-AnyEvent.spec:1.20
--- packages/perl-AnyEvent/perl-AnyEvent.spec:1.19 Sun Feb 20 23:47:53 2011
+++ packages/perl-AnyEvent/perl-AnyEvent.spec Mon Feb 21 16:51:14 2011
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO:
+# - incorrectly installs itself to perl_vendorarch, but only constants.pl
should go there
#
# Conditional build:
%bcond_without tests # do not perform "make test"
@@ -10,7 +12,7 @@
Summary(pl.UTF-8): AnyEvent - szkielet dla wielu pętli zdarzeń
Name: perl-AnyEvent
Version: 5.31
-Release: 2
+Release: 3
Epoch: 3
# same as perl
License: GPL v1+ or Artistic
@@ -21,7 +23,6 @@
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
Suggests: %{name}-Impl-EV
-BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -209,6 +210,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.20 2011/02/21 15:51:14 sparky
+- no longer noarch: 1. installs to archdir and 2. constants.pl may differ
+ on different archs
+- release: 3
+
Revision 1.19 2011/02/20 22:47:53 sparky
- moved all but pureperl implementations to subpackages
- S: perl-AnyEvent-Impl-EV -- it is the best choice
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/perl-AnyEvent/perl-AnyEvent.spec?r1=1.19&r2=1.20&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: perl-AnyEvent/perl-AnyEvent.spec - moved all but pureperl impleme...
Author: sparky Date: Sun Feb 20 22:47:58 2011 GMT
Module: packages Tag: HEAD
Log message:
- moved all but pureperl implementations to subpackages
- S: perl-AnyEvent-Impl-EV -- it is the best choice
- removed perl(EV) version hack, version 4.00 is required now
- release: 2
Files affected:
packages/perl-AnyEvent:
perl-AnyEvent.spec (1.18 -> 1.19)
Diffs:
Index: packages/perl-AnyEvent/perl-AnyEvent.spec
diff -u packages/perl-AnyEvent/perl-AnyEvent.spec:1.18
packages/perl-AnyEvent/perl-AnyEvent.spec:1.19
--- packages/perl-AnyEvent/perl-AnyEvent.spec:1.18 Sun Feb 20 21:49:13 2011
+++ packages/perl-AnyEvent/perl-AnyEvent.spec Sun Feb 20 23:47:53 2011
@@ -10,7 +10,7 @@
Summary(pl.UTF-8): AnyEvent - szkielet dla wielu pętli zdarzeń
Name: perl-AnyEvent
Version: 5.31
-Release: 1
+Release: 2
Epoch: 3
# same as perl
License: GPL v1+ or Artistic
@@ -20,6 +20,7 @@
URL: http://search.cpan.org/dist/AnyEvent/
BuildRequires: perl-devel >= 1:5.8.0
BuildRequires: rpm-perlprov >= 4.1-13
+Suggests: %{name}-Impl-EV
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -31,16 +32,91 @@
Rozszerzenie AnyEvent ma za zadanie udostępnić pojedynczą i
zoptymalizowaną pętlę zdarzeń dla szerokiej gamy aplikacji.
+%package Impl-Cocoa
+Summary: AnyEvent implementation based on Cocoa::EventLoop
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Cocoa
+AnyEvent implementation based on Cocoa::EventLoop..
+
+%package Impl-EV
+Summary: AnyEvent implementation based on libev
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-EV
+AnyEvent implementation based on libev (best choice).
+
+%package Impl-Event
+Summary: AnyEvent implementation based on Event
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Event
+AnyEvent implementation based on Event (very stable, few glitches).
+
+%package Impl-EventLib
+Summary: AnyEvent implementation based on EventLib
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-EventLib
+AnyEvent implementation based on EventLib (leaks memory and worse).
+
+%package Impl-Glib
+Summary: AnyEvent implementation based on Glib
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Glib
+AnyEvent implementation based on Glib (slow but very stable).
+
+%package Impl-IOAsync
+Summary: AnyEvent implementation based on IOAsync
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-IOAsync
+AnyEvent implementation based on IO::Async.
+
+%package Impl-Irssi
+Summary: AnyEvent implementation for Irssi
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Irssi
+AnyEvent implementation used when running within irssi.
+
+%package Impl-POE
+Summary: AnyEvent implementation based on POE
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-POE
+AnyEvent implementation based on POE (very slow, some limitations).
+
+%package Impl-Qt
+Summary: AnyEvent implementation based on Qt
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Qt
+AnyEvent implementation based on Qt.
+
+%package Impl-Tk
+Summary: AnyEvent implementation based on Tk
+Group: Development/Languages/Perl
+Requires: %{name} = %{epoch}:%{version}-%{release}
+
+%description Impl-Tk
+AnyEvent implementation based on Tk (very broken).
+
%prep
%setup -q -n %{pnam}-%{version}
# we are not allowed to use network while building package
%{__rm} t/05_dns.t
-# satisfy rpm version deps, we have 3.9 in repo
-# $ rpmvercmp 3.44 3.9
-# 3.44 > 3.9
-%{__sed} -i -e 's/use EV 3.44/use EV 3.5/' lib/AnyEvent/Impl/EV.pm
-
%build
%{__perl} Makefile.PL \
INSTALLDIRS=vendor
@@ -61,10 +137,71 @@
%defattr(644,root,root,755)
%doc Changes README
%{perl_vendorarch}/AnyEvent.pm
-%{perl_vendorarch}/AnyEvent
+%dir %{perl_vendorarch}/AnyEvent
+%{perl_vendorarch}/AnyEvent/*.pm
+%dir %{perl_vendorarch}/AnyEvent/Impl
+# pureperl implementation, works everywhere, requires nothing
+%{perl_vendorarch}/AnyEvent/Impl/Perl.pm
+%{perl_vendorarch}/AnyEvent/Util
+%{perl_vendorarch}/AnyEvent/FAQ.pod
+%{perl_vendorarch}/AnyEvent/Intro.pod
+%{perl_vendorarch}/AnyEvent/constants.pl
%{perl_vendorarch}/AE.pm
%{_mandir}/man3/AE.3pm*
-%{_mandir}/man3/AnyEvent*.3pm*
+%{
packages: gource/gource.spec - dropped BR: gawk (false positive generated b...
Author: sparky Date: Sat Feb 19 22:00:32 2011 GMT Module: packages Tag: HEAD Log message: - dropped BR: gawk (false positive generated by cleanbuild) Files affected: packages/gource: gource.spec (1.9 -> 1.10) Diffs: Index: packages/gource/gource.spec diff -u packages/gource/gource.spec:1.9 packages/gource/gource.spec:1.10 --- packages/gource/gource.spec:1.9 Sat Feb 19 20:52:25 2011 +++ packages/gource/gource.spec Sat Feb 19 23:00:27 2011 @@ -15,7 +15,6 @@ BuildRequires: SDL_image-devel >= 1.2 BuildRequires: freetype-devel BuildRequires: ftgl-devel >= 2.1.3 -BuildRequires: gawk BuildRequires: glew-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel @@ -78,6 +77,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2011/02/19 22:00:27 sparky +- dropped BR: gawk (false positive generated by cleanbuild) + Revision 1.9 2011/02/19 19:52:25 glen - BR: gawk, glew-devel CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gource/gource.spec?r1=1.9&r2=1.10&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/links_dlc.pl
Author: sparky
Date: Sat Feb 19 01:11:45 2011
New Revision: 12160
Added:
toys/rsget.pl/links_dlc.pl (contents, props changed)
Log:
- NEW: extracts links from .dlc file
- usage: ./links_dlc.pl file.dlc >> get.list
Added: toys/rsget.pl/links_dlc.pl
==
--- (empty file)
+++ toys/rsget.pl/links_dlc.pl Sat Feb 19 01:11:45 2011
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+#
+# 2011 (c) Przemysław Iskra
+# This program is free software,
+# you may distribute it under GPL v2 or newer.
+use strict;
+use warnings;
+use Crypt::Rijndael;
+use MIME::Base64;
+
+$/ = undef;
+
+# hide from google
+my @str = (
+ '<=ff=j<=;
+$dlcdata =~ s/\s+//gs;
+$dlcdata =~ s/=?=?$/==/s;
+
+my $key = substr $dlcdata, -88, 88, '';
+
+open my $rcf, "-|", qw(wget -O - -q), $str[ 2 ] . $key;
+my $rc = <$rcf>;
+close $rcf;
+
+$rc =~ m#(.+)#s;
+$rc = decode_base64( $1 );
+
+my $crypt = Crypt::Rijndael->new( $str[ 0 ], Crypt::Rijndael::MODE_CBC() );
+$crypt->set_iv( $str[ 1 ] );
+my $dlckey = $crypt->decrypt( $rc );
+
+$crypt = Crypt::Rijndael->new( $dlckey, Crypt::Rijndael::MODE_CBC() );
+$crypt->set_iv( $dlckey );
+
+my $data = decode_base64( $crypt->decrypt( decode_base64( $dlcdata ) ) );
+while ( $data =~ s#(.+?)##s ) {
+ local $_ = $1;
+ m#(.*?)#;
+ print "ADD: " . decode_base64( $1 ) . "\n";
+}
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - remove _al...
Author: sparky Date: Wed Feb 16 22:14:02 2011 GMT
Module: packages Tag: HEAD
Log message:
- remove _alt_kernel references from userspace (reverted uzsolt's commit)
- kernel module now provides: kernel-video-fglrx if built with _alt_kernel
Files affected:
packages/xorg-driver-video-fglrx:
xorg-driver-video-fglrx.spec (1.223 -> 1.224)
Diffs:
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.223
packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.224
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.223 Wed Feb
16 23:03:31 2011
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Wed Feb
16 23:13:56 2011
@@ -32,7 +32,7 @@
%definepname xorg-driver-video-fglrx
Summary: Linux Drivers for ATI graphics accelerators
Summary(pl.UTF-8): Sterowniki do akceleratorów graficznych ATI
-Name: %{pname}%{_alt_kernel}
+Name: %{pname}
Version: 11.1
Release: %{rel}%{?with_multigl:.mgl}
Epoch: 1
@@ -54,12 +54,12 @@
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
-Requires: %{pname}%{_alt_kernel}-libs = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) <= 8.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Suggests: %{name}-config
-Suggests: kernel%{_alt_kernel}-video-firegl
+Suggests: kernel-video-firegl
Provides: xorg-xserver-module(glx)
Obsoletes: X11-driver-firegl < 1:7.0.0
Obsoletes: XFree86-driver-firegl < 1:7.0.0
@@ -189,6 +189,9 @@
License: ATI
Group: Base/Kernel
%{?with_dist_kernel:%requires_releq_kernel}
+%if "%{_alt_kernel}" != "%{nil}"
+Provides: kernel-video-firegl =
%{epoch}:%{version}-%{rel}@%{_kernel_ver_str}
+%endif
Requires(post,postun): /sbin/depmod
%description -n kernel%{_alt_kernel}-video-firegl
@@ -445,6 +448,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.224 2011/02/16 22:13:56 sparky
+- remove _alt_kernel references from userspace (reverted uzsolt's commit)
+- kernel module now provides: kernel-video-fglrx if built with _alt_kernel
+
Revision 1.223 2011/02/16 22:03:31 sparky
- config subpackage is part of userspace: extended %if to cover its %files
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.223&r2=1.224&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - config sub...
Author: sparky Date: Wed Feb 16 22:03:36 2011 GMT
Module: packages Tag: HEAD
Log message:
- config subpackage is part of userspace: extended %if to cover its %files
Files affected:
packages/xorg-driver-video-fglrx:
xorg-driver-video-fglrx.spec (1.222 -> 1.223)
Diffs:
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.222
packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.223
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.222 Wed Feb
16 22:39:19 2011
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec Wed Feb
16 23:03:31 2011
@@ -427,11 +427,11 @@
%attr(755,root,root) %{_sysconfdir}/acpi/ati-powermode.sh
%{_sysconfdir}/acpi/events/*
%{_mandir}/man8/atieventsd.8*
-%endif
%files config
%defattr(644,root,root,755)
%{_sysconfdir}/X11/xorg.conf.d/10-fglrx.conf
+%endif
%if %{with kernel}
%files -n kernel%{_alt_kernel}-video-firegl
@@ -445,6 +445,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.223 2011/02/16 22:03:31 sparky
+- config subpackage is part of userspace: extended %if to cover its %files
+
Revision 1.222 2011/02/16 21:39:19 uzsolt
- fix requires and suggests with alt_kernel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.222&r2=1.223&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet/Line.pm
Author: sparky
Date: Tue Feb 15 00:38:53 2011
New Revision: 12151
Modified:
toys/rsget.pl/RSGet/Line.pm
Log:
- collapse whitespaces before printing
Modified: toys/rsget.pl/RSGet/Line.pm
==
--- toys/rsget.pl/RSGet/Line.pm (original)
+++ toys/rsget.pl/RSGet/Line.pm Tue Feb 15 00:38:53 2011
@@ -210,7 +210,7 @@
my $text = shift;
$text = "" unless defined $text;
$text =~ s/\n+$//sg;
- $text =~ s/\n/ /sg;
+ $text =~ s/\s+/ /sg;
$text =~ s/\0/***/g;
$active{ $line }->[1] = $text;
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: toys/rsget.pl/RSGet: Get.pm Wait.pm
Author: sparky
Date: Tue Feb 15 00:38:23 2011
New Revision: 12150
Modified:
toys/rsget.pl/RSGet/Get.pm
toys/rsget.pl/RSGet/Wait.pm
Log:
- allow plugins to die without killing whole rsget.pl
Modified: toys/rsget.pl/RSGet/Get.pm
==
--- toys/rsget.pl/RSGet/Get.pm (original)
+++ toys/rsget.pl/RSGet/Get.pm Tue Feb 15 00:38:23 2011
@@ -102,7 +102,7 @@
}
}
- $self->start();
+ $self->call( \&start );
return $self;
}
@@ -198,6 +198,21 @@
return $self->stage0();
}
+sub call
+{
+ my $self = shift;
+ my $func = shift;
+
+ local $SIG{__DIE__};
+ delete $SIG{__DIE__};
+ eval {
+ return &$func( $self, @_ );
+ };
+ if ( $@ ) {
+ $self->problem( "function call problem: $@" );
+ }
+}
+
sub cookie
{
my $self = shift;
@@ -257,7 +272,7 @@
return;
}
$_ = $self->{body};
- &$func( $self );
+ $self->call( $func );
}
sub click_download
@@ -325,8 +340,7 @@
if ( $self->{is_html} ) {
$self->print( "is HTML" );
$_ = $self->{body};
- my $func = $self->{stage_is_html};
- return &$func( $self );
+ return $self->call( $self->{stage_is_html} );
}
RSGet::Dispatch::mark_used( $self );
Modified: toys/rsget.pl/RSGet/Wait.pm
==
--- toys/rsget.pl/RSGet/Wait.pm (original)
+++ toys/rsget.pl/RSGet/Wait.pm Tue Feb 15 00:38:23 2011
@@ -59,8 +59,7 @@
$self->linedata();
$self->linecolor();
- my $func = $self->{wait_next};
- &$func( $self );
+ $self->call( $self->{wait_next} );
}
sub wait_update
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: java-oro/java-oro.spec - BR: rpm-javaprov
Author: sparky Date: Sat Feb 12 22:35:28 2011 GMT Module: packages Tag: HEAD Log message: - BR: rpm-javaprov Files affected: packages/java-oro: java-oro.spec (1.19 -> 1.20) Diffs: Index: packages/java-oro/java-oro.spec diff -u packages/java-oro/java-oro.spec:1.19 packages/java-oro/java-oro.spec:1.20 --- packages/java-oro/java-oro.spec:1.19Sat Feb 12 21:41:38 2011 +++ packages/java-oro/java-oro.spec Sat Feb 12 23:35:23 2011 @@ -20,6 +20,7 @@ BuildRequires: ant >= 1.5 BuildRequires: jdk BuildRequires: jpackage-utils +BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 BuildRequires: unzip Provides: jakarta-oro @@ -108,6 +109,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.20 2011/02/12 22:35:23 sparky +- BR: rpm-javaprov + Revision 1.19 2011/02/12 20:41:38 qboosh - unified CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-oro/java-oro.spec?r1=1.19&r2=1.20&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: rpmlint/rpmlint.spec - BR: python-modules, python-rpm, rpm-python...
Author: sparky Date: Sat Feb 12 22:33:47 2011 GMT Module: packages Tag: HEAD Log message: - BR: python-modules, python-rpm, rpm-pythonprov Files affected: packages/rpmlint: rpmlint.spec (1.35 -> 1.36) Diffs: Index: packages/rpmlint/rpmlint.spec diff -u packages/rpmlint/rpmlint.spec:1.35 packages/rpmlint/rpmlint.spec:1.36 --- packages/rpmlint/rpmlint.spec:1.35 Sat Feb 12 20:48:08 2011 +++ packages/rpmlint/rpmlint.spec Sat Feb 12 23:33:41 2011 @@ -19,6 +19,9 @@ Patch4:pythonpath.patch URL: http://rpmlint.zarb.org/ BuildRequires: python >= 1.5.2 +BuildRequires: python-modules +BuildRequires: python-rpm +BuildRequires: rpm-pythonprov BuildRequires: tar >= 1:1.22 BuildRequires: xz Requires: /bin/bash @@ -128,6 +131,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.36 2011/02/12 22:33:41 sparky +- BR: python-modules, python-rpm, rpm-pythonprov + Revision 1.35 2011/02/12 19:48:08 glen - fix testing CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpmlint/rpmlint.spec?r1=1.35&r2=1.36&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: gscan2pdf/gscan2pdf.spec - further pldization - added tests bcond...
Author: sparky Date: Sat Feb 12 20:23:59 2011 GMT
Module: packages Tag: HEAD
Log message:
- further pldization
- added tests bcond
- make tests moved from %check to %build
Files affected:
packages/gscan2pdf:
gscan2pdf.spec (1.9 -> 1.10)
Diffs:
Index: packages/gscan2pdf/gscan2pdf.spec
diff -u packages/gscan2pdf/gscan2pdf.spec:1.9
packages/gscan2pdf/gscan2pdf.spec:1.10
--- packages/gscan2pdf/gscan2pdf.spec:1.9 Fri Feb 4 19:23:54 2011
+++ packages/gscan2pdf/gscan2pdf.spec Sat Feb 12 21:23:53 2011
@@ -1,5 +1,8 @@
# $Revision$, $Date$
#
+# Conditional build:
+%bcond_without tests # do not perform "make test"
+#
%include /usr/lib/rpm/macros.perl
Summary: A GUI to produce PDFs from scanned documents
Name: gscan2pdf
@@ -14,6 +17,7 @@
URL: http://gscan2pdf.sourceforge.net/
BuildRequires: desktop-file-utils
BuildRequires: gettext-devel
+%{?with_tests:BuildRequires: perl-Test-Pod}
BuildRequires: perl-devel
BuildRequires: rpm-perlprov >= 4.1-13
Requires(post,postun): gtk-update-icon-cache
@@ -52,6 +56,8 @@
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make}
+%{?with_tests:%{__make} test}
+
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
@@ -67,9 +73,6 @@
%find_lang %{name}
-%check
-make test
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -96,6 +99,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.10 2011/02/12 20:23:53 sparky
+- further pldization
+- added tests bcond
+- make tests moved from %check to %build
+
Revision 1.9 2011/02/04 18:23:54 wiget
- Requires(post,postun): gtk-update-icon-cache
@@ -121,4 +129,3 @@
Revision 1.2 2009/02/17 13:51:51 jajcus
- PLDized a bit
-
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gscan2pdf/gscan2pdf.spec?r1=1.9&r2=1.10&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: lrzip/lrzip.spec - BR: perl-tools-pod
Author: sparky Date: Sat Feb 12 15:11:17 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: perl-tools-pod
Files affected:
packages/lrzip:
lrzip.spec (1.22 -> 1.23)
Diffs:
Index: packages/lrzip/lrzip.spec
diff -u packages/lrzip/lrzip.spec:1.22 packages/lrzip/lrzip.spec:1.23
--- packages/lrzip/lrzip.spec:1.22 Sat Feb 12 14:55:59 2011
+++ packages/lrzip/lrzip.spec Sat Feb 12 16:11:12 2011
@@ -21,6 +21,7 @@
%{?with_system_lzma:BuildRequires: lzma-devel >= 4.43-5}
BuildRequires: lzo-devel >= 2.02-1
BuildRequires: nasm
+BuildRequires: perl-tools-pod
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -85,6 +86,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.23 2011/02/12 15:11:12 sparky
+- BR: perl-tools-pod
+
Revision 1.22 2011/02/12 13:55:59 wiget
- up to 0.552
- lzma.patch not updated
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lrzip/lrzip.spec?r1=1.22&r2=1.23&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: qof/qof.spec - BR: db-devel
Author: sparky Date: Sat Feb 12 15:08:24 2011 GMT Module: packages Tag: HEAD Log message: - BR: db-devel Files affected: packages/qof: qof.spec (1.9 -> 1.10) Diffs: Index: packages/qof/qof.spec diff -u packages/qof/qof.spec:1.9 packages/qof/qof.spec:1.10 --- packages/qof/qof.spec:1.9 Sat Feb 12 12:58:52 2011 +++ packages/qof/qof.spec Sat Feb 12 16:08:19 2011 @@ -13,6 +13,7 @@ URL: https://alioth.debian.org/projects/qof/ BuildRequires: autoconf >= 2.61 BuildRequires: automake +BuildRequires: db-devel BuildRequires: gettext-devel >= 0.18.1 BuildRequires: glib2-devel >= 1:2.10.0 BuildRequires: libgda3-devel >= 3.0.1 @@ -26,11 +27,11 @@ %description QOF is an offshoot of the GnuCash engine, consisting of those pieces -unrelated to accounting. The Query Engine allows C/C++ applications -to treat random collections of objects as if they were SQL tables, -and perform table-join type queries across them. In addition, the -query engine can be backed by an actual database, so that instances -of local objects can act as a 'cache' to a much larger SQL database. +unrelated to accounting. The Query Engine allows C/C++ applications to +treat random collections of objects as if they were SQL tables, and +perform table-join type queries across them. In addition, the query +engine can be backed by an actual database, so that instances of local +objects can act as a 'cache' to a much larger SQL database. %description -l pl.UTF-8 QOF to odprysk silnika GnuCasha, składający się z części nie @@ -132,6 +133,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2011/02/12 15:08:19 sparky +- BR: db-devel + Revision 1.9 2011/02/12 11:58:52 qboosh - missing dir CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qof/qof.spec?r1=1.9&r2=1.10&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: jython/jython.spec - BR: rpm-pythonprov
Author: sparky Date: Sat Feb 12 15:08:09 2011 GMT Module: packages Tag: HEAD Log message: - BR: rpm-pythonprov Files affected: packages/jython: jython.spec (1.33 -> 1.34) Diffs: Index: packages/jython/jython.spec diff -u packages/jython/jython.spec:1.33 packages/jython/jython.spec:1.34 --- packages/jython/jython.spec:1.33Sat Feb 12 07:37:30 2011 +++ packages/jython/jython.spec Sat Feb 12 16:08:04 2011 @@ -11,6 +11,7 @@ URL: http://www.jython.org/ BuildRequires: jdk >= 1.5 BuildRequires: jpackage-utils +BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils Requires: jre >= 1.5 @@ -223,6 +224,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.34 2011/02/12 15:08:04 sparky +- BR: rpm-pythonprov + Revision 1.33 2011/02/12 06:37:30 qboosh - updated to 2.5.1 - -tools (including jythonc) are gone CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/jython/jython.spec?r1=1.33&r2=1.34&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: tennix/tennix.spec - BR: SDL_net-devel, SDL_ttf-devel, libstdc++-...
Author: sparky Date: Fri Feb 11 14:39:30 2011 GMT
Module: packages Tag: HEAD
Log message:
- BR: SDL_net-devel, SDL_ttf-devel, libstdc++-devel, python-modules
Files affected:
packages/tennix:
tennix.spec (1.21 -> 1.22)
Diffs:
Index: packages/tennix/tennix.spec
diff -u packages/tennix/tennix.spec:1.21 packages/tennix/tennix.spec:1.22
--- packages/tennix/tennix.spec:1.21Fri Feb 11 10:48:10 2011
+++ packages/tennix/tennix.spec Fri Feb 11 15:39:25 2011
@@ -14,7 +14,11 @@
URL: http://icculus.org/tennix/
BuildRequires: SDL_image-devel
BuildRequires: SDL_mixer-devel
+BuildRequires: SDL_net-devel
+BuildRequires: SDL_ttf-devel
+BuildRequires: libstdc++-devel
BuildRequires: python-devel
+BuildRequires: python-modules
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -69,6 +73,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.22 2011/02/11 14:39:25 sparky
+- BR: SDL_net-devel, SDL_ttf-devel, libstdc++-devel, python-modules
+
Revision 1.21 2011/02/11 09:48:10 lisu
- updated to 1.1
- do not drop orginal FLAGS
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tennix/tennix.spec?r1=1.21&r2=1.22&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: lmms/lmms.spec - BR: portaudio-devel
Author: sparky Date: Fri Feb 11 14:38:29 2011 GMT Module: packages Tag: HEAD Log message: - BR: portaudio-devel Files affected: packages/lmms: lmms.spec (1.5 -> 1.6) Diffs: Index: packages/lmms/lmms.spec diff -u packages/lmms/lmms.spec:1.5 packages/lmms/lmms.spec:1.6 --- packages/lmms/lmms.spec:1.5 Fri Feb 11 14:15:58 2011 +++ packages/lmms/lmms.spec Fri Feb 11 15:38:23 2011 @@ -24,6 +24,7 @@ BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel BuildRequires: pkgconfig +BuildRequires: portaudio-devel BuildRequires: pulseaudio-devel BuildRequires: qt4-build BuildRequires: qt4-qmake @@ -117,6 +118,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.6 2011/02/11 14:38:23 sparky +- BR: portaudio-devel + Revision 1.5 2011/02/11 13:15:58 dirdival - updated to 0.4.10 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lmms/lmms.spec?r1=1.5&r2=1.6&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: rc-scripts/rc-scripts.spec - static BR: glibc-static
Author: sparky Date: Fri Feb 11 14:20:08 2011 GMT
Module: packages Tag: HEAD
Log message:
- static BR: glibc-static
Files affected:
packages/rc-scripts:
rc-scripts.spec (1.345 -> 1.346)
Diffs:
Index: packages/rc-scripts/rc-scripts.spec
diff -u packages/rc-scripts/rc-scripts.spec:1.345
packages/rc-scripts/rc-scripts.spec:1.346
--- packages/rc-scripts/rc-scripts.spec:1.345 Fri Feb 11 08:59:36 2011
+++ packages/rc-scripts/rc-scripts.spec Fri Feb 11 15:20:01 2011
@@ -22,6 +22,7 @@
BuildRequires: gettext-devel
BuildRequires: glib2-devel
%{?with_static:BuildRequires: glib2-static}
+%{?with_static:BuildRequires: glibc-static}
BuildRequires: libcap-devel >= 1:2.17
BuildRequires: linux-libc-headers >= 7:2.6.27
BuildRequires: pkgconfig
@@ -369,6 +370,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.346 2011/02/11 14:20:01 sparky
+- static BR: glibc-static
+
Revision 1.345 2011/02/11 07:59:36 arekm
- rel 4; fix static linking with glib2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rc-scripts/rc-scripts.spec?r1=1.345&r2=1.346&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: cmus/cmus.spec - BR: flac-devel
Author: sparky Date: Fri Feb 11 01:46:31 2011 GMT Module: packages Tag: HEAD Log message: - BR: flac-devel Files affected: packages/cmus: cmus.spec (1.9 -> 1.10) Diffs: Index: packages/cmus/cmus.spec diff -u packages/cmus/cmus.spec:1.9 packages/cmus/cmus.spec:1.10 --- packages/cmus/cmus.spec:1.9 Fri Feb 11 00:34:50 2011 +++ packages/cmus/cmus.spec Fri Feb 11 02:46:26 2011 @@ -16,6 +16,7 @@ %endif BuildRequires: faad2-devel BuildRequires: ffmpeg-devel +BuildRequires: flac-devel BuildRequires: libao-devel BuildRequires: libmad-devel BuildRequires: libmodplug-devel @@ -352,6 +353,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.10 2011/02/11 01:46:26 sparky +- BR: flac-devel + Revision 1.9 2011/02/10 23:34:50 uzsolt - 2.3.4 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cmus/cmus.spec?r1=1.9&r2=1.10&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: fbida/fbida.spec, fbv/fbv.spec, geninitrd/geninitrd.spec, initram...
Author: sparky Date: Fri Feb 11 01:33:30 2011 GMT
Module: packages Tag: HEAD
Log message:
- s/util-linux-ng7util-linux/
Files affected:
packages/fbida:
fbida.spec (1.17 -> 1.18)
packages/fbv:
fbv.spec (1.15 -> 1.16)
packages/geninitrd:
geninitrd.spec (2.173 -> 2.174)
packages/initramfs-tools:
initramfs-tools.spec (1.30 -> 1.31)
packages/ksplice:
ksplice.spec (1.1 -> 1.2)
packages/libtorrent-rasterbar:
libtorrent-rasterbar.spec (1.52 -> 1.53)
packages/udisks:
udisks.spec (1.19 -> 1.20)
Diffs:
Index: packages/fbida/fbida.spec
diff -u packages/fbida/fbida.spec:1.17 packages/fbida/fbida.spec:1.18
--- packages/fbida/fbida.spec:1.17 Mon Feb 1 18:22:31 2010
+++ packages/fbida/fbida.spec Fri Feb 11 02:33:24 2011
@@ -48,7 +48,7 @@
BuildRequires: perl-base
BuildRequires: pkgconfig
%{?with_sane:BuildRequires:sane-backends-devel}
-BuildRequires: util-linux-ng
+BuildRequires: util-linux
BuildRequires: which
BuildRequires: xorg-lib-libXpm-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -188,6 +188,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.18 2011/02/11 01:33:24 sparky
+- s/util-linux-ng7util-linux/
+
Revision 1.17 2010/02/01 17:22:31 sparky
- BR: ImageMagick-devel, util-linux-ng, which
Index: packages/fbv/fbv.spec
diff -u packages/fbv/fbv.spec:1.15 packages/fbv/fbv.spec:1.16
--- packages/fbv/fbv.spec:1.15 Mon Feb 1 18:12:11 2010
+++ packages/fbv/fbv.spec Fri Feb 11 02:33:25 2011
@@ -13,7 +13,7 @@
BuildRequires: giflib-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: util-linux-ng
+BuildRequires: util-linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -60,6 +60,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.16 2011/02/11 01:33:25 sparky
+- s/util-linux-ng7util-linux/
+
Revision 1.15 2010/02/01 17:12:11 sparky
- BR: util-linux-ng (for getopt)
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.173
packages/geninitrd/geninitrd.spec:2.174
--- packages/geninitrd/geninitrd.spec:2.173 Wed Feb 9 20:23:07 2011
+++ packages/geninitrd/geninitrd.spec Fri Feb 11 02:33:25 2011
@@ -42,7 +42,7 @@
%endif
# suggest for blkid
%if "%{pld_release}" != "ac"
-Suggests: util-linux-ng-initrd
+Suggests: util-linux-initrd
%endif
Obsoletes: mkinitrd
%if "%{pld_release}" == "ac"
@@ -123,6 +123,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 2.174 2011/02/11 01:33:25 sparky
+- s/util-linux-ng7util-linux/
+
Revision 2.173 2011/02/09 19:23:07 glen
- test .2
Index: packages/initramfs-tools/initramfs-tools.spec
diff -u packages/initramfs-tools/initramfs-tools.spec:1.30
packages/initramfs-tools/initramfs-tools.spec:1.31
--- packages/initramfs-tools/initramfs-tools.spec:1.30 Fri Jun 4 08:29:06 2010
+++ packages/initramfs-tools/initramfs-tools.spec Fri Feb 11 02:33:25 2011
@@ -36,7 +36,7 @@
Requires: module-init-tools
Requires: mount
Requires: udev-initramfs
-Requires: util-linux-ng
+Requires: util-linux
Suggests: busybox-initrd >= 1.15.3-3
Suggests: cryptsetup-luks-initramfs
Suggests: cryptsetup-luks-initrd
@@ -54,7 +54,7 @@
Suggests: opensc-initramfs
Suggests: suspend-initrd
Suggests: udev-initrd
-Suggests: util-linux-ng-initrd
+Suggests: util-linux-initrd
Suggests: v86d-initrd
Suggests: xfsprogs-initrd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -168,6 +168,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.31 2011/02/11 01:33:25 sparky
+- s/util-linux-ng7util-linux/
+
Revision 1.30 2010/06/04 06:29:06 glen
- adapter
Index: packages/ksplice/ksplice.spec
diff -u packages/ksplice/ksplice.spec:1.1 packages/ksplice/ksplice.spec:1.2
--- packages/ksplice/ksplice.spec:1.1 Tue Sep 21 10:23:43 2010
+++ packages/ksplice/ksplice.spec Fri Feb 11 02:33:25 2011
@@ -27,7 +27,7 @@
Requires: perl
Requires: sh-utils
Requires: tar
-Requires: util-linux-ng
+Requires: util-linux
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,5 +70,8 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.2 2011/02/11 01:33:25 sparky
+- s/util-linux-ng7util-linux/
+
packages: util-linux/util-linux-diet.patch - fixed and improved mkostemp re...
Author: sparky Date: Fri Feb 11 00:17:25 2011 GMT
Module: packages Tag: HEAD
Log message:
- fixed and improved mkostemp replacement, still uses mktemp so it stinks
Files affected:
packages/util-linux:
util-linux-diet.patch (1.1 -> 1.2)
Diffs:
Index: packages/util-linux/util-linux-diet.patch
diff -u packages/util-linux/util-linux-diet.patch:1.1
packages/util-linux/util-linux-diet.patch:1.2
--- packages/util-linux/util-linux-diet.patch:1.1 Thu Feb 10 23:44:39 2011
+++ packages/util-linux/util-linux-diet.patch Fri Feb 11 01:17:20 2011
@@ -106,14 +106,14 @@
if (rc <= 0)
return -errno;
-+#ifndef HAVE_MKOSTEMP
-+ if ( mktemp( n ) == NULL ) {
++#ifdef HAVE_MKOSTEMP
+ fd = mkostemp(n, flags | O_EXCL);
++#else
++ if ( mktemp(n) == NULL || n[0] == '\0' ) {
+ free(n);
+ return -errno;
+ }
-+ fd = open(n, flags | O_EXCL);
-+#else
- fd = mkostemp(n, flags | O_EXCL);
++ fd = open(n, flags | O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+#endif
if (fd >= 0 && name)
*name = n;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux-diet.patch?r1=1.1&r2=1.2&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: util-linux/util-linux.spec - release: 1; please test -initrd
Author: sparky Date: Thu Feb 10 23:50:56 2011 GMT
Module: packages Tag: HEAD
Log message:
- release: 1; please test -initrd
Files affected:
packages/util-linux:
util-linux.spec (1.304 -> 1.305)
Diffs:
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.304
packages/util-linux/util-linux.spec:1.305
--- packages/util-linux/util-linux.spec:1.304 Thu Feb 10 23:52:56 2011
+++ packages/util-linux/util-linux.spec Fri Feb 11 00:50:50 2011
@@ -29,12 +29,12 @@
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
Version: 2.19
-Release: 0.1
+Release: 1
License: GPL
Group: Applications/System
Source0:
http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/%{name}-%{version}.tar.bz2
# Source0-md5: 590ca71aad0b254e2631d84401f28255
-Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2
+Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
Source3: %{name}-blockdev.init
@@ -598,8 +598,8 @@
Summary: blkid - initrd version
Summary(pl.UTF-8): blkid - wersja dla initrd
Group: Base
-Conflicts: geninitrd < 1.10
Obsoletes: util-linux-ng-initrd
+Conflicts: geninitrd < 1.10
%description initrd
This package includes a blkid utility to recognize partitions by label
@@ -1405,6 +1405,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.305 2011/02/10 23:50:50 sparky
+- release: 1; please test -initrd
+
Revision 1.304 2011/02/10 22:52:56 sparky
- util-linux name is back, no more -ng
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.304&r2=1.305&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: util-linux-ng/login.pamd (REMOVED), util-linux-ng/util-linux-bloc...
Author: sparky Date: Thu Feb 10 22:55:59 2011 GMT Module: packages Tag: HEAD Log message: - renamed (back) to util-linux Files affected: packages/util-linux-ng: login.pamd (1.11 -> NONE) (REMOVED), util-linux-blockdev.init (1.14 -> NONE) (REMOVED), util-linux-blockdev.sysconfig (1.3 -> NONE) (REMOVED), util-linux-ctrlaltdel-man.patch (1.1 -> NONE) (REMOVED), util-linux-diet.patch (1.5 -> NONE) (REMOVED), util-linux-fdformat-ide.patch (1.1 -> NONE) (REMOVED), util-linux-fhs.patch (1.2 -> NONE) (REMOVED), util-linux-hotkeys.patch (1.3 -> NONE) (REMOVED), util-linux-login-lastlog.patch (1.2 -> NONE) (REMOVED), util-linux-ng-ppc.patch (1.1 -> NONE) (REMOVED), util-linux-ng.spec (1.87 -> NONE) (REMOVED), util-linux-ng-union-mount.patch (1.2 -> NONE) (REMOVED), util-linux-procpartitions.patch (1.4 -> NONE) (REMOVED), util-linux-swaponsymlink.patch (1.2 -> NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: util-linux/util-linux.spec - util-linux name is back, no more -ng
Author: sparky Date: Thu Feb 10 22:53:02 2011 GMT
Module: packages Tag: HEAD
Log message:
- util-linux name is back, no more -ng
Files affected:
packages/util-linux:
util-linux.spec (1.303 -> 1.304)
Diffs:
Index: packages/util-linux/util-linux.spec
diff -u packages/util-linux/util-linux.spec:1.303
packages/util-linux/util-linux.spec:1.304
--- packages/util-linux/util-linux.spec:1.303 Thu Feb 10 23:46:31 2011
+++ packages/util-linux/util-linux.spec Thu Feb 10 23:52:56 2011
@@ -27,28 +27,28 @@
Summary(ru.UTF-8): Набор базовых системных утилит для Linux
Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
-Name: util-linux-ng
+Name: util-linux
Version: 2.19
Release: 0.1
License: GPL
Group: Applications/System
-Source0:
http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{version}.tar.bz2
+Source0:
http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/%{name}-%{version}.tar.bz2
# Source0-md5: 590ca71aad0b254e2631d84401f28255
Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2
# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
Source2: login.pamd
-Source3: util-linux-blockdev.init
-Source4: util-linux-blockdev.sysconfig
-Patch0:%{name}-ppc.patch
-Patch1:%{name}-union-mount.patch
-Patch2:util-linux-ctrlaltdel-man.patch
-Patch3:util-linux-fdformat-ide.patch
-Patch4:util-linux-fhs.patch
-Patch5:util-linux-hotkeys.patch
-Patch7:util-linux-login-lastlog.patch
-Patch8:util-linux-procpartitions.patch
-Patch9:util-linux-swaponsymlink.patch
-Patch10: util-linux-diet.patch
+Source3: %{name}-blockdev.init
+Source4: %{name}-blockdev.sysconfig
+Patch0:%{name}-ng-ppc.patch
+Patch1:%{name}-ng-union-mount.patch
+Patch2:%{name}-ctrlaltdel-man.patch
+Patch3:%{name}-fdformat-ide.patch
+Patch4:%{name}-fhs.patch
+Patch5:%{name}-hotkeys.patch
+Patch7:%{name}-login-lastlog.patch
+Patch8:%{name}-procpartitions.patch
+Patch9:%{name}-swaponsymlink.patch
+Patch10: %{name}-diet.patch
URL: http://userweb.kernel.org/~kzak/util-linux/
BuildRequires: audit-libs-devel >= 1.0.6
BuildRequires: autoconf
@@ -82,7 +82,6 @@
Provides: fdisk
Provides: linux32
Provides: sparc32
-Provides: util-linux = %{version}-%{release}
Obsoletes: cramfs
Obsoletes: ionice
Obsoletes: linux32
@@ -90,7 +89,7 @@
Obsoletes: schedutils
Obsoletes: setarch
Obsoletes: sparc32
-Obsoletes: util-linux
+Obsoletes: util-linux-ng <= %{version}-%{release}
Obsoletes: util-linux-suids
Conflicts: e2fsprogs < 1.41.8-5
Conflicts: shadow-extras < 1:4.0.3-6
@@ -316,8 +315,7 @@
Summary: chkdupexe - find duplicate executables
Summary(pl.UTF-8): chkdupexe odszukuje powtarzające się pliki uruchamialne
Group: Applications/System
-Provides: util-linux-chkdupexe = %{version}-%{release}
-Obsoletes: util-linux-chkdupexe
+Obsoletes: util-linux-ng-chkdupexe
%description chkdupexe
chkdupexe will scan the union of $PATH and a hardcoded list of common
@@ -601,6 +599,7 @@
Summary(pl.UTF-8): blkid - wersja dla initrd
Group: Base
Conflicts: geninitrd < 1.10
+Obsoletes: util-linux-ng-initrd
%description initrd
This package includes a blkid utility to recognize partitions by label
@@ -611,7 +610,7 @@
etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
%prep
-%setup -q -a1 -n util-linux-%{version}
+%setup -q -a1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -760,7 +759,7 @@
%endif
%endif
-%find_lang util-linux
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -800,7 +799,7 @@
%post -n libmount -p /sbin/ldconfig
%postun -n libmount -p /sbin/ldconfig
-%files -f util-linux.lang
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc */README.* text-utils/LICENSE.pg NEWS
@@ -1406,6 +1405,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.304 2011/02/10 22:52:56 sparky
+- util-linux name is back, no more -ng
+
Revision 1.303 2011/02/10 22:46:31 sparky
- copied from util-linux-ng.spec
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.303&r2=1.304&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: util-linux/util-linux-ng.spec (REMOVED) - removed; was a mistake
Author: sparky Date: Thu Feb 10 22:47:04 2011 GMT Module: packages Tag: HEAD Log message: - removed; was a mistake Files affected: packages/util-linux: util-linux-ng.spec (1.1 -> NONE) (REMOVED) Diffs: ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
packages: util-linux/util-linux.spec - copied from util-linux-ng.spec
Author: sparky Date: Thu Feb 10 22:46:36 2011 GMT
Module: packages Tag: HEAD
Log message:
- copied from util-linux-ng.spec
Files affected:
packages/util-linux:
util-linux.spec (1.302 -> 1.303)
Diffs:
Index: packages/util-linux/util-linux.spec
diff -u /dev/null packages/util-linux/util-linux.spec:1.303
--- /dev/null Thu Feb 10 23:46:36 2011
+++ packages/util-linux/util-linux.spec Thu Feb 10 23:46:31 2011
@@ -0,0 +1,2053 @@
+# $Revision$, $Date$
+#
+# Conditional build:
+%bcond_withuClibc # link initrd version with static glibc
instead of uClibc
+%bcond_without dietlibc# link initrd version with dietlibc instead of
uClibc
+%bcond_without selinux # SELinux support
+%if "%{pld_release}" == "ac"
+%bcond_withinitrd # don't build initrd version
+%bcond_withfallocate # fallocate utility (needs glibc 2.11
to compile)
+%else
+%bcond_without initrd # don't build initrd version
+%bcond_without fallocate # fallocate utility (needs glibc 2.11 to
compile)
+%endif
+
+%if "%{pld_release}" == "ac"
+%definepam_ver 0.79.0
+%else
+%definepam_ver 0.99.7.1
+%endif
+
+Summary: Collection of basic system utilities for Linux
+Summary(de.UTF-8): Sammlung von grundlegenden Systemdienstprogrammen für
Linux
+Summary(es.UTF-8): Colectánea de utilitarios básicos de sistema para Linux
+Summary(fr.UTF-8): Ensemble d'utilitaires système de base pour Linux
+Summary(pl.UTF-8): Zbiór podstawowych narzędzi systemowych dla Linuksa
+Summary(pt_BR.UTF-8): Coletânea de utilitários básicos de sistema para Linux
+Summary(ru.UTF-8): Набор базовых системных утилит для Linux
+Summary(tr.UTF-8): Temel sistem araçları
+Summary(uk.UTF-8): Набір базових системних утиліт для Linux
+Name: util-linux-ng
+Version: 2.19
+Release: 0.1
+License: GPL
+Group: Applications/System
+Source0:
http://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/util-linux-%{version}.tar.bz2
+# Source0-md5: 590ca71aad0b254e2631d84401f28255
+Source1:
http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/util-linux-non-english-man-pages.tar.bz2
+# Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
+Source2: login.pamd
+Source3: util-linux-blockdev.init
+Source4: util-linux-blockdev.sysconfig
+Patch0:%{name}-ppc.patch
+Patch1:%{name}-union-mount.patch
+Patch2:util-linux-ctrlaltdel-man.patch
+Patch3:util-linux-fdformat-ide.patch
+Patch4:util-linux-fhs.patch
+Patch5:util-linux-hotkeys.patch
+Patch7:util-linux-login-lastlog.patch
+Patch8:util-linux-procpartitions.patch
+Patch9:util-linux-swaponsymlink.patch
+Patch10: util-linux-diet.patch
+URL: http://userweb.kernel.org/~kzak/util-linux/
+BuildRequires: audit-libs-devel >= 1.0.6
+BuildRequires: autoconf
+BuildRequires: automake >= 1:1.10
+BuildRequires: gettext-devel
+%{?with_fallocate:BuildRequires: glibc-devel >= 6:2.11}
+BuildRequires: gtk-doc-automake
+%{?with_selinux:BuildRequires: libselinux-devel}
+%{?with_selinux:BuildRequires: libsepol-devel}
+BuildRequires: libtool
+BuildRequires: linux-libc-headers >= 7:2.6.27
+BuildRequires: ncurses-devel >= 5.0
+BuildRequires: pam-devel >= %{pam_ver}
+BuildRequires: pkgconfig
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpmbuild(macros) >= 1.470
+BuildRequires: sed >= 4.0
+BuildRequires: zlib-devel
+%if %{with initrd}
+ %if %{with uClibc}
+BuildRequires: uClibc-static >= 2:0.9.29
+ %else
+ %if %{with dietlibc}
+BuildRequires: dietlibc-static >= 2:0.32-7
+ %else
+BuildRequires: glibc-static
+ %endif
+ %endif
+%endif
+Requires: pam >= %{pam_ver}
+Provides: fdisk
+Provides: linux32
+Provides: sparc32
+Provides: util-linux = %{version}-%{release}
+Obsoletes: cramfs
+Obsoletes: ionice
+Obsoletes: linux32
+Obsoletes: rawdevices
+Obsoletes: schedutils
+Obsoletes: setarch
+Obsoletes: sparc32
+Obsoletes: util-linux
+Obsoletes: util-linux-suids
+Conflicts: e2fsprogs < 1.41.8-5
+Conflicts: shadow-extras < 1:4.0.3-6
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%definedebugcflags -O1 -g
+
+# for some reason known only to rpm there must be "\\|" not "\|" here
+%definedietarch%(echo %{_target_cpu} | sed -e
's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%definedietlibdir %{_prefix}/lib/dietlibc/lib-%{dietarch}
+
+%ifarch ppc ppc64
+# for
packages: util-linux/login.pamd, util-linux/util-linux-blockdev.init, util-...
Author: sparky Date: Thu Feb 10 22:44:45 2011 GMT
Module: packages Tag: HEAD
Log message:
- copied from util-linux-ng
Files affected:
packages/util-linux:
login.pamd (1.12 -> 1.13) , util-linux-blockdev.init (1.15 -> 1.16) ,
util-linux-blockdev.sysconfig (1.4 -> 1.5) , util-linux-ctrlaltdel-man.patch
(1.2 -> 1.3) , util-linux-diet.patch (NONE -> 1.1) (NEW),
util-linux-fdformat-ide.patch (1.2 -> 1.3) , util-linux-fhs.patch (1.7 -> 1.8)
, util-linux-hotkeys.patch (1.2 -> 1.3) , util-linux-login-lastlog.patch (1.2
-> 1.3) , util-linux-ng-ppc.patch (NONE -> 1.1) (NEW),
util-linux-ng-union-mount.patch (NONE -> 1.1) (NEW), util-linux-ng.spec (NONE
-> 1.1) (NEW), util-linux-procpartitions.patch (1.2 -> 1.3) ,
util-linux-swaponsymlink.patch (1.2 -> 1.3)
Diffs:
Index: packages/util-linux/login.pamd
diff -u /dev/null packages/util-linux/login.pamd:1.13
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/login.pamd Thu Feb 10 23:44:39 2011
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth requiredpam_listfile.so item=user sense=deny
file=/etc/security/blacklist.login onerr=succeed
+auth requiredpam_securetty.so
+auth include system-auth
+accountrequiredpam_shells.so
+accountrequiredpam_nologin.so
+accountrequiredpam_access.so
+accountinclude system-auth
+password include system-auth
+# pam_selinux.so close should be the first session rule
+# session requiredpam_selinux.so close
+sessioninclude system-auth
+sessionoptionalpam_console.so
+sessionoptionalpam_mail.so
+# pam_selinux.so open should only be followed by sessions to be executed in
the user context
+#session requiredpam_selinux.so open
+#session optionalpam_keyinit.so force revoke
+sessionoptionalpam_ck_connector.so
Index: packages/util-linux/util-linux-blockdev.init
diff -u /dev/null packages/util-linux/util-linux-blockdev.init:1.16
--- /dev/null Thu Feb 10 23:44:45 2011
+++ packages/util-linux/util-linux-blockdev.initThu Feb 10 23:44:39 2011
@@ -0,0 +1,117 @@
+#!/bin/sh
+#
+# blockdev This shell script takes care of starting and stopping
blockdev.
+#
+# chkconfig: 2345 01 99
+# description: blockdev
+#
+# processname: blockdev
+# config:
+# pidfile:
+
+[ -f /etc/sysconfig/blockdev ] || exit 0
+
+blockdevs=$(awk -F= '!/^#/ && !/^$/ {if ($2) print $1}'
/etc/sysconfig/blockdev)
+if [ -z "$blockdevs" ]; then
+ case "$1" in
+ start|stop|restart|force-reload)
+ exit 0
+ ;;
+ esac
+fi
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source blockdev configuration.
+. /etc/sysconfig/blockdev
+
+start() {
+ if [ ! -f /var/lock/subsys/blockdev ]; then
+ for var in $blockdevs; do
+ realdrive=
+ drive=${var#BLOCKDEV_}
+ if [ -d "/sys/block/${drive}" -a -e "/dev/${drive}" ];
then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ elif drive=$(echo $drive | tr _ -) && [ -d
"/sys/block/${drive}" -a -e "/dev/${drive}" ]; then
+ realdrive="/dev/${drive}"
+ elif [ -e "/dev/mapper/${drive}" ]; then
+ realdrive="/dev/mapper/${drive}"
+ fi
+
+ if [ -n "$realdrive" ]; then
+ eval PARAMS=\$$var
+ if [ -n "${PARAMS}" ]; then
+ show "Setting parameters for block
drive %s (%s)" "$drive" "$PARAMS"
+ busy
+ /sbin/blockdev ${PARAMS} $realdrive
+ ok
+ fi
+ fi
+ done
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/blockdev
+ else
+ msg_already_running blockdev
+ fi
+}
+
+stop() {
+ # Stop daemons.
+ if [ ! -f /var/lock/subsys/blockdev ]; then
+ msg_not_running blockdev
+ fi
+ rm -f /var/lock/s
