SOURCES: libxspf-link.patch (NEW) copy of libspiff-link.patch
Author: wigetDate: Sun Mar 29 08:14:15 2009 GMT
Module: SOURCES Tag: HEAD
Log message:
copy of libspiff-link.patch
Files affected:
SOURCES:
libxspf-link.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/libxspf-link.patch
diff -u /dev/null SOURCES/libxspf-link.patch:1.1
--- /dev/null Sun Mar 29 10:14:16 2009
+++ SOURCES/libxspf-link.patch Sun Mar 29 10:14:10 2009
@@ -0,0 +1,17 @@
+--- libspiff-0.7.3/configure.ac.orig 2007-09-14 21:56:40.0 +0200
libspiff-0.7.3/configure.ac2007-09-15 14:45:09.396937254 +0200
+@@ -87,14 +87,6 @@
+
+
+
+-# Append $prefix as a fallback at the very end
+-if test "x${prefix}" != "xNONE"; then
+- WORKING_PREFIX=${prefix}
+-else
+- WORKING_PREFIX=${ac_default_prefix}
+-fi
+-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
+-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
+
+
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-lucene.spec - build contrib packages too; rel 4
Author: paszczus Date: Sun Mar 29 08:15:55 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- build contrib packages too; rel 4
Files affected:
SPECS:
java-lucene.spec (1.6 -> 1.7)
Diffs:
Index: SPECS/java-lucene.spec
diff -u SPECS/java-lucene.spec:1.6 SPECS/java-lucene.spec:1.7
--- SPECS/java-lucene.spec:1.6 Sun Mar 29 00:04:51 2009
+++ SPECS/java-lucene.spec Sun Mar 29 10:15:49 2009
@@ -24,7 +24,7 @@
Summary: Text search engine library in Java
Name: java-%{srcname}
Version: 2.4.1
-Release: 3
+Release: 4
License: Apache v2.0
Group: Development/Languages/Java
Source0:
http://www.apache.net.pl/lucene/java/lucene-%{version}-src.tar.gz
@@ -74,6 +74,18 @@
install -d build
%ant -Dbuild.sysclasspath=only
+# Build contrib packages too
+cd contrib
+CONTRIB_PACKAGES="analyzers benchmark db highlighter instantiated lucli memory
miscellaneous queries regex similarity snowball spellchecker surround swing
wikipedia wordnet xml-query-parser"
+for i in $CONTRIB_PACKAGES
+do
+cd $i
+install -d build
+%ant
+cd -
+done
+
+cd ..
%if %{with javadoc}
%javadoc -d apidocs \
%{?with_java_sun:org.apache.lucene} \
@@ -119,6 +131,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.7 2009/03/29 08:15:49 paszczus
+- build contrib packages too; rel 4
+
Revision 1.6 2009/03/28 23:04:51 pawelz
- correct paths in jar
- rel 3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-lucene.spec?r1=1.6&r2=1.7&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLD-doc: PLD-update-TODO - updated
OLD] 1.12 [NEW] 1.13 libiec61883(9) [OLD] 1.1.0 [NEW] 1.2.0 @@ -520,7 +521,6 @@ lout(11) [OLD] 3.31 [NEW] 3.38 lsat(11) [OLD] 0.9.6 [NEW] 0.9.7.1 lshw(13) [OLD] B.02.14 [NEW] T.00.07 -lsof(13) [OLD] 4.81 [NEW] 4.82 ltrace(13) [OLD] 0.5 [NEW] 0.5.1 lua40(11) [OLD] 4.0.1 [NEW] 5.1.4 lua50(13) [OLD] 5.0.3 [NEW] 5.1.4 @@ -550,7 +550,7 @@ mono(25) [OLD] 2.0.1 [NEW] 2.4 monodevelop(19) [OLD] 1.9.1 [NEW] 2.0 monotheka(10) [OLD] 0.0.6 [NEW] 0.0.7 -moodle(13) [OLD] 1.9.3 [NEW] 20090328 +moodle(13) [OLD] 1.9.3 [NEW] 20090329 moon-buggy(9) [OLD] 1.0 [NEW] 1.0.51 mopac7(9) [OLD] 1.13 [NEW] 1.14 mozilla-addon-livehttpheaders(10) [OLD] 0.10 [NEW] 0.14 @@ -596,7 +596,6 @@ ocaml-ulex(9) [OLD] 0.8 [NEW] 1.1 ocaml-wlex(12) [OLD] 20030827 [NEW] 20051031 ocaml-zip(11) [OLD] 1.03 [NEW] 1.04 -odf-converter-integrator(9) [OLD] 0.1.5 [NEW] 0.2.0 online-desktop(8) [OLD] 0.2.28 [NEW] 0.2.29 opal(20) [OLD] 3.4.2 [NEW] 3.4.4 openais(12) [OLD] 0.80.3 [NEW] 0.94 @@ -723,6 +722,7 @@ perl-DBD-Multiplex(16) [OLD] 2.04 [NEW] 2.09 perl-DBD-ODBC(17) [OLD] 1.13 [NEW] 1.18 perl-DBD-Oracle(13) [OLD] 1.16 [NEW] 1.22 +perl-DBD-Pg(33) [OLD] 2.11.8 [NEW] 2.12.0 perl-DBD-PgPP(17) [OLD] 0.05 [NEW] 0.06 perl-DBIx-Class-TimeStamp(17) [OLD] 0.05 [NEW] 0.07 perl-DBIx-TextIndex(17) [OLD] 0.27 [NEW] 0.28 @@ -1290,12 +1290,9 @@ ruby-dict(9) [OLD] 0.9.2 [NEW] 0.9.4 ruby-eet(9) [OLD] 0.1.3 [NEW] 0.1.4 ruby-json(9) [OLD] 1.1.1 [NEW] 1.1.3 -ruby-mechanize(9) [OLD] 0.9.1 [NEW] 0.9.2 -ruby-memcache-client(8) [OLD] 1.5.0 [NEW] 1.7.0 ruby-money(9) [OLD] 1.7.1 [NEW] 2.1.3 ruby-odbc(9) [OLD] 0.997 [NEW] 0.9996 ruby-open4(9) [OLD] 0.1.0 [NEW] 0.9.6 -ruby-parsetree(10) [OLD] 2.0.2 [NEW] 3.0.3 ruby-rcodetools(9) [OLD] 0.7.0 [NEW] 0.8.1.0 ruby-ruport(9) [OLD] 0.11.0 [NEW] 1.6.1 ruby-termios(9) [OLD] 0.9.4 [NEW] 0.9.5 @@ -1342,7 +1339,7 @@ tango-icon-theme(13) [OLD] 0.8.1 [NEW] 0.8.90 taptunnel(11) [OLD] 0.31 [NEW] 0.211 tar(19) [OLD] 1.21 [NEW] 1.22 -taskjuggler(14) [OLD] 2.4.0 [NEW] 20090328 +taskjuggler(14) [OLD] 2.4.0 [NEW] 20090329 tastymenu(9) [OLD] 1.0.6 [NEW] 1.0.7 taztv(9) [OLD] 0.48 [NEW] 0.49 tcsh(24) [OLD] 6.13.00 [NEW] 6.16.00 @@ -1373,7 +1370,7 @@ valgrind-valkyrie(10) [OLD] 1.1.0 [NEW] 1.4.0 vdr(17) [OLD] 1.4.1 [NEW] 1.6.0 verilog(9) [OLD] 0.8.6 [NEW] 0.8.7 -vim-spell-pl(9) [OLD] 20090211 [NEW] 20090328 +vim-spell-pl(9) [OLD] 20090211 [NEW] 20090329 vmips(9) [OLD] 1.3.1 [NEW] 1.3.2 vnc2swf(10) [OLD] 0.4.2 [NEW] 0.5.0 vpnd(9) [OLD] 1.1.2 [NEW] 1.1.4 @@ -1463,12 +1460,12 @@ xfce4-genmon-plugin(9) [OLD] 3.0 [NEW] 3.2 xfce4-power-manager(9) [OLD] 0.6.4 [NEW] 0.6.5 xfce4-sensors-plugin(9) [OLD] 0.10.99.3 [NEW] 0.10.99.6 -xmbmon(9) [OLD] 205 [NEW] 205conf xmlto(10) [OLD] 0.0.21 [NEW] 0.0.22 xorg-driver-video-intel(9) [OLD] 2.6.3 [NEW] 2.6.99.902 xorg-driver-video-mga(11) [OLD] 1.4.9 [NEW] 1.9.100 xsp(12) [OLD] 2.2 [NEW] 2.4 xsw(9) [OLD] 1.34.0 [NEW] 2.5.5 +xterm(9) [OLD] 242 [NEW] 243 yate(11) [OLD] 0.8.7 [NEW] 0.9.0pre4 yui(8) [OLD] 2.7.0b [NEW] 3.0.0pr2 yum-utils(10) [OLD] 1.1.19 [NEW] 1.1.21 CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/PLD-doc/PLD-update-TODO?r1=1.373&r2=1.374&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: xterm.spec - up to 243
Author: arekmDate: Sun Mar 29 08:41:19 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 243
Files affected:
SPECS:
xterm.spec (1.39 -> 1.40)
Diffs:
Index: SPECS/xterm.spec
diff -u SPECS/xterm.spec:1.39 SPECS/xterm.spec:1.40
--- SPECS/xterm.spec:1.39 Mon Feb 16 22:11:23 2009
+++ SPECS/xterm.specSun Mar 29 10:41:14 2009
@@ -2,12 +2,12 @@
Summary: Terminal emulator for X
Summary(pl.UTF-8): Emulator terminala dla X
Name: xterm
-Version: 242
+Version: 243
Release: 1
License: MIT
Group: X11/Applications
Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
-# Source0-md5: 663fa3aac8e30e4c2d4bf07c0aee4dca
+# Source0-md5: be25d2d3661d0bb77fc66e1bcbb3caba
Source1: XTerm.ad-pl
Source2: %{name}.desktop
Source3: %{name}.png
@@ -96,6 +96,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.40 2009/03/29 08:41:14 arekm
+- up to 243
+
Revision 1.39 2009/02/16 21:11:23 arekm
- up to 242
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xterm.spec?r1=1.39&r2=1.40&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: xterm-243.tgz
Files fetched: 1 STORED: ftp://invisible-island.net/xterm/xterm-243.tgz be25d2d3661d0bb77fc66e1bcbb3caba xterm-243.tgz Size: 874033 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
SPECS (AC-branch): bind.spec - disable epoll due to errors with Ac kernel 2...
Author: marcus Date: Sun Mar 29 09:33:19 2009 GMT
Module: SPECS Tag: AC-branch
Log message:
- disable epoll due to errors with Ac kernel 2.4.
- rel.2.
Files affected:
SPECS:
bind.spec (1.274.2.4 -> 1.274.2.5)
Diffs:
Index: SPECS/bind.spec
diff -u SPECS/bind.spec:1.274.2.4 SPECS/bind.spec:1.274.2.5
--- SPECS/bind.spec:1.274.2.4 Sat Mar 21 00:12:51 2009
+++ SPECS/bind.spec Sun Mar 29 11:33:13 2009
@@ -25,7 +25,7 @@
%defineplevel P2
Name: bind
Version: %{ver}.%{plevel}
-Release: 1
+Release: 2
Epoch: 7
License: BSD-like
Group: Networking/Daemons
@@ -368,6 +368,8 @@
--with-dlz-odbc=no \
--with-dlz-stub=yes \
--enable-largefile \
+ --disable-epoll \
+ --disable-devpoll \
%{!?with_static_libs:--enable-static=no} \
--enable-threads \
--enable-getifaddrs=glibc
@@ -543,6 +545,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.274.2.5 2009/03/29 09:33:13 marcus
+- disable epoll due to errors with Ac kernel 2.4.
+- rel.2.
+
Revision 1.274.2.4 2009/03/20 23:12:51 arekm
- up to 9.4.3; DNSSEC Lookaside Validation fixes
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bind.spec?r1=1.274.2.4&r2=1.274.2.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
SPECS (AC-branch): samba.spec - up to 3.0.34.
Author: marcus Date: Sun Mar 29 10:16:00 2009 GMT
Module: SPECS Tag: AC-branch
Log message:
- up to 3.0.34.
Files affected:
SPECS:
samba.spec (1.348.2.7.2.13 -> 1.348.2.7.2.14)
Diffs:
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.348.2.7.2.13 SPECS/samba.spec:1.348.2.7.2.14
--- SPECS/samba.spec:1.348.2.7.2.13 Tue Dec 2 19:01:52 2008
+++ SPECS/samba.specSun Mar 29 12:15:52 2009
@@ -41,13 +41,13 @@
Summary(uk.UTF-8): SMB клієнт та сервер
Summary(zh_CN.UTF-8): Samba 客户端和服务器
Name: samba
-Version: 3.0.33
+Version: 3.0.34
Release: 1
Epoch: 1
License: GPL v2
Group: Networking/Daemons
Source0:
http://download.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 03a2049988427c3cebe69078cf2d147d
+# Source0-md5: 62404f39bb3dd0a37d6396c57e04c907
Source1: smb.init
Source2: %{name}.pamd
Source3: swat.inetd
@@ -1505,6 +1505,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.348.2.7.2.14 2009/03/29 10:15:52 marcus
+- up to 3.0.34.
+
Revision 1.348.2.7.2.13 2008/12/02 18:01:52 marcus
- utf8 wrr
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/samba.spec?r1=1.348.2.7.2.13&r2=1.348.2.7.2.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
SOURCES (AC-branch): samba-doc.patch - fix for 3.0.34
Author: marcus Date: Sun Mar 29 10:16:18 2009 GMT Module: SOURCES Tag: AC-branch Log message: - fix for 3.0.34 Files affected: SOURCES: samba-doc.patch (1.2.2.1 -> 1.2.2.2) Diffs: Index: SOURCES/samba-doc.patch diff -u SOURCES/samba-doc.patch:1.2.2.1 SOURCES/samba-doc.patch:1.2.2.2 --- SOURCES/samba-doc.patch:1.2.2.1 Thu Aug 28 11:12:03 2008 +++ SOURCES/samba-doc.patch Sun Mar 29 12:16:11 2009 @@ -1,27 +1,3 @@ samba-3.0.32/docs/htmldocs/index.html~ 2008-08-28 10:43:48.761671415 +0200 -+++ samba-3.0.32/docs/htmldocs/index.html 2008-08-28 10:48:47.274975582 +0200 -@@ -23,19 +23,11 @@ - This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework. - - -- Using Samba, 2nd Edition -- Using Samba, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients. -- -- -- Man pages -+ Man pages - The Samba man pages in HTML. - - -- WHATSNEW -+ WHATSNEW - Samba Release Notes. - -- -- README.VENDOR -- VENDOR specific information. -- - diff -Nur -x '*~' b.samba-3.0.24/docs/htmldocs/Samba3-ByExample/samba.css n.samba-3.0.24/docs/htmldocs/Samba3-ByExample/samba.css --- b.samba-3.0.24/docs/htmldocs/Samba3-ByExample/samba.css2006-11-14 11:04:24.0 +0100 +++ n.samba-3.0.24/docs/htmldocs/Samba3-ByExample/samba.css2007-04-19 22:57:31.0 +0200 @@ -310,3 +286,14 @@ width: 40em; } +--- samba-3.0.34/docs/htmldocs/index.html.orig 2009-01-19 11:51:18.0 +0100 samba-3.0.34/docs/htmldocs/index.html 2009-03-29 12:10:22.0 +0200 +@@ -31,7 +31,7 @@ + The Samba man pages in HTML. + + +- WHATSNEW ++ WHATSNEW + Samba Release Notes. + + CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/samba-doc.patch?r1=1.2.2.1&r2=1.2.2.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
DISTFILES: samba-3.0.34.tar.gz samba-vscan-0.3.6c-beta5.tar.gz
Files fetched: 1 STORED: http://download.samba.org/samba/ftp/stable/samba-3.0.34.tar.gz 62404f39bb3dd0a37d6396c57e04c907 samba-3.0.34.tar.gz Size: 24835363 bytes ALREADY GOT: http://www.openantivirus.org/download/samba-vscan-0.3.6c-beta5.tar.gz 8f1dd119172e04e6d7c2d05526a4cf8b samba-vscan-0.3.6c-beta5.tar.gz -- 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
SPECS: mpd.spec - packed defaults dirs and files - BR: curl-devel, ffmpeg-d...
Author: charles Date: Sun Mar 29 11:02:03 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- packed defaults dirs and files
- BR: curl-devel, ffmpeg-devel, lame-libs-devel
- with/without mod and pulse bcond
Files affected:
SPECS:
mpd.spec (1.27 -> 1.28)
Diffs:
Index: SPECS/mpd.spec
diff -u SPECS/mpd.spec:1.27 SPECS/mpd.spec:1.28
--- SPECS/mpd.spec:1.27 Mon Mar 9 02:37:30 2009
+++ SPECS/mpd.spec Sun Mar 29 13:01:57 2009
@@ -2,6 +2,11 @@
# TODO:
# - add dir to store playlists and songs DB
# - add logrotate
+#
+# Conditional build:
+%bcond_withmod # enable MOD support
+%bcond_without pulse # disable PulseAudio support
+#
Summary: Music Player Daemon
Summary(hu.UTF-8): Music Player Daemon
Summary(pl.UTF-8): Music Player Daemon - demon odtwarzający muzykę
@@ -18,21 +23,25 @@
BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: audiofile-devel >= 0.1.7
BuildRequires: avahi-devel
+BuildRequires: curl-devel
# imho doesn't need ">= 2.6.1" to faad2-devel
BuildRequires: faad2-devel
+BuildRequires: ffmpeg-devel
BuildRequires: flac-devel >= 1.1.0
+BuildRequires: glib2-devel
BuildRequires: jack-audio-connection-kit-devel >= 0.4
+BuildRequires: lame-libs-devel
BuildRequires: libao-devel >= 0.8.3
BuildRequires: libid3tag-devel
BuildRequires: libmad-devel
-BuildRequires: libmikmod-devel >= 3.1.7
+%{?with_mod:BuildRequires: libmikmod-devel >= 3.1.7}
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
BuildRequires: libsamplerate-devel >= 0.0.15
BuildRequires: libshout-devel
BuildRequires: libvorbis-devel
BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: pulseaudio-devel
+%{?with_pulse:BuildRequires: pulseaudio-devel}
BuildRequires: zlib-devel
Provides: group(mpd)
Provides: user(mpd)
@@ -71,19 +80,27 @@
%configure \
ac_cv_lib_iconv_main=no \
ac_cv_lib_nsl_gethostbyname=no \
+ %{!?with_pulse:--disable-pulse} \
+ %{?with_mod:--enable-mod} \
--enable-ao
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d} \
+ $RPM_BUILD_ROOT{/var/lib/mpd/playlists,/var/log/mpd,/var/run/mpd}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d}
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mpd
+touch $RPM_BUILD_ROOT/var/lib/mpd/mpd.db
+touch $RPM_BUILD_ROOT/var/log/mpd/mpd.error
+touch $RPM_BUILD_ROOT/var/log/mpd/mpd.log
+touch $RPM_BUILD_ROOT/var/run/mpd/mpdstate
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,6 +109,13 @@
%useradd -u 204 -r -d /home/services/mpd -s /bin/false -c "Music Player Daemon
(MPD) user" -g audio -G mpd mpd
%post
+for f in mpd.log mpd.error; do
+ if [ ! -f /var/log/%{name}/$f ]; then
+ touch /var/log/%{name}/$f
+ chown mpd:mpd /var/log/%{name}/$f
+ chmod 644 /var/log/%{name}/$f
+ fi
+done
/sbin/chkconfig --add mpd
%preun
@@ -112,6 +136,14 @@
%attr(755,root,root) %{_bindir}/*
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mpd.conf
%attr(754,root,root) /etc/rc.d/init.d/mpd
+%dir %attr(770,root,mpd) /var/lib/%{name}
+%dir %attr(770,root,mpd) /var/lib/%{name}/playlists
+%dir %attr(751,root,root) /var/log/%{name}
+%dir %attr(770,root,mpd) /var/run/%{name}
+%attr(644,mpd,mpd) %ghost /var/lib/%{name}/mpd.db
+%attr(644,mpd,mpd) %ghost /var/log/%{name}/mpd.error
+%attr(644,mpd,mpd) %ghost /var/log/%{name}/mpd.log
+%attr(644,mpd,mpd) %ghost /var/run/%{name}/mpdstate
%{_mandir}/man1/mpd.1*
%{_mandir}/man5/mpd.conf.5*
@@ -121,6 +153,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.28 2009/03/29 11:01:57 charles
+- packed defaults dirs and files
+- BR: curl-devel, ffmpeg-devel, lame-libs-devel
+- with/without mod and pulse bcond
+
Revision 1.27 2009/03/09 01:37:30 gotar
- chkconfig --del mpd not httpd, thanks grapeli23 for pointing out
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mpd.spec?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
SOURCES: mpd.conf - logs to /var/log
Author: charles Date: Sun Mar 29 11:03:00 2009 GMT Module: SOURCES Tag: HEAD Log message: - logs to /var/log Files affected: SOURCES: mpd.conf (1.1 -> 1.2) Diffs: Index: SOURCES/mpd.conf diff -u SOURCES/mpd.conf:1.1 SOURCES/mpd.conf:1.2 --- SOURCES/mpd.conf:1.1Mon Nov 3 19:48:39 2008 +++ SOURCES/mpd.confSun Mar 29 13:02:54 2009 @@ -9,8 +9,8 @@ music_directory "/music" playlist_directory "/var/lib/mpd/playlists" db_file "/var/lib/mpd/mpd.db" -log_file"/var/lib/mpd/mpd.log" -error_file "/var/lib/mpd/mpd.error" +log_file"/var/log/mpd/mpd.log" +error_file "/var/log/mpd/mpd.error" CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mpd.conf?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
SPECS: transmission.spec - separated -gui - BR: gettext-devel, libstdc++-de...
Author: charles Date: Sun Mar 29 11:12:16 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- separated -gui
- BR: gettext-devel, libstdc++-devel
- rel. 2
Files affected:
SPECS:
transmission.spec (1.41 -> 1.42)
Diffs:
Index: SPECS/transmission.spec
diff -u SPECS/transmission.spec:1.41 SPECS/transmission.spec:1.42
--- SPECS/transmission.spec:1.41Mon Mar 23 21:56:29 2009
+++ SPECS/transmission.spec Sun Mar 29 13:12:11 2009
@@ -5,7 +5,7 @@
Summary(pl.UTF-8): Wszechstronny i wieloplatformowy klient BitTorrenta
Name: transmission
Version: 1.51
-Release: 1
+Release: 2
License: MIT
Group: Applications/Communications
Source0:
http://download.m0k.org/transmission/files/%{name}-%{version}.tar.bz2
@@ -14,19 +14,18 @@
URL: http://transmissionbt.com/
BuildRequires: curl-devel >= 7.15.0
BuildRequires: dbus-glib-devel >= 0.70
+BuildRequires: gettext-devel
BuildRequires: glib2-devel >= 1:2.16.0
BuildRequires: gtk+2-devel >= 2:2.6.0
BuildRequires: intltool >= 0.35.5
#BuildRequires:libevent-devel
BuildRequires: libnotify-devel >= 0.4.4
+BuildRequires: libstdc++-devel
BuildRequires: openssl-devel >= 0.9.4
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.357
-Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): gtk+2
-Requires: gtk+2 >= 2:2.6.0
-Obsoletes: Transmission <= 1.05
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes: Transmission <= 1.05
%define_appdir %{_datadir}/%{name}/web
@@ -50,6 +49,35 @@
przez użytkownika. Transmission stawia na równowagę zapewnienia
przydatnej funkcjonalności bez nadmiaru opcji.
+%package gui
+Summary: A versatile and multi-platform BitTorrent client
+Summary(pl.UTF-8): Wszechstronny i wieloplatformowy klient BitTorrenta
+Group: X11/Applications/Communications
+Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): gtk+2
+Requires: gtk+2 >= 2:2.6.0
+Requires: %{name}-%{version}-%{release}
+
+%description gui
+Transmission has been built from the ground up to be a lightweight,
+yet powerful BitTorrent client. Its simple, intuitive interface is
+designed to integrate tightly with whatever computing environment you
+choose to use. Transmission strikes a balance between providing useful
+functionality without feature bloat.
+
+%description gui -l hu.UTF-8
+Transmission egy könnyűsúlyú de mégis egy erőteljes BitTorrent kliens.
+Egyszerű, intuitív felülete szorosan illeszkedik bármilyen
+számítógépes környezetbe, amit csak választasz. A Transmission célja
+megtalálni a használható funkcionalitást lehetőségek áradata nélkül.
+
+%description gui -l pl.UTF-8
+Transmission został stworzony od podstaw, aby być lekkim lecz mającym
+duże możliwości klientem BitTorrenta. Jego prosty, intuicyjny
+interfejs jest zaprojektowany spójnie z dowolnym środowiskiem wybranym
+przez użytkownika. Transmission stawia na równowagę zapewnienia
+przydatnej funkcjonalności bez nadmiaru opcji.
+
%prep
%setup -q -c -n transmission-%{version}
mv transmission-%{version}/* .
@@ -77,26 +105,21 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%post gui
%update_desktop_database_post
%update_icon_cache hicolor
-%postun
+%postun gui
%update_desktop_database_postun
%update_icon_cache hicolor
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS NEWS README
-%attr(755,root,root) %{_bindir}/transmission
%attr(755,root,root) %{_bindir}/transmissioncli
%attr(755,root,root) %{_bindir}/transmission-daemon
%attr(755,root,root) %{_bindir}/transmission-remote
%{_mandir}/man1/*.1*
-%{_desktopdir}/transmission.desktop
-%{_pixmapsdir}/transmission.png
-%{_iconsdir}/hicolor/*/apps/transmission.png
-%{_iconsdir}/hicolor/*/apps/transmission.svg
%dir %{_datadir}/%{name}
%dir %{_appdir}
%{_appdir}/images
@@ -104,12 +127,24 @@
%{_appdir}/stylesheets
%{_appdir}/index.html
+%files gui
+%attr(755,root,root) %{_bindir}/transmission
+%{_desktopdir}/transmission.desktop
+%{_pixmapsdir}/transmission.png
+%{_iconsdir}/hicolor/*/apps/transmission.png
+%{_iconsdir}/hicolor/*/apps/transmission.svg
+
%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.42 2009/03/29 11:12:11 charles
+- separated -gui
+- BR: gettext-devel, libstdc++-devel
+- rel. 2
+
Revision 1.41 2009/03/23 20:56:29 uzsolt
- hu summary and description
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/transmission.spec?r1=1.41&r2=1.42&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: transmission.spec - cosmetic
Author: charles Date: Sun Mar 29 11:24:16 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- cosmetic
Files affected:
SPECS:
transmission.spec (1.42 -> 1.43)
Diffs:
Index: SPECS/transmission.spec
diff -u SPECS/transmission.spec:1.42 SPECS/transmission.spec:1.43
--- SPECS/transmission.spec:1.42Sun Mar 29 13:12:11 2009
+++ SPECS/transmission.spec Sun Mar 29 13:24:10 2009
@@ -24,8 +24,8 @@
BuildRequires: openssl-devel >= 0.9.4
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.357
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: Transmission <= 1.05
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define_appdir %{_datadir}/%{name}/web
@@ -140,6 +140,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.43 2009/03/29 11:24:10 charles
+- cosmetic
+
Revision 1.42 2009/03/29 11:12:11 charles
- separated -gui
- BR: gettext-devel, libstdc++-devel
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/transmission.spec?r1=1.42&r2=1.43&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: transmission.spec - defattr for -gui
Author: charles Date: Sun Mar 29 11:25:31 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- defattr for -gui
Files affected:
SPECS:
transmission.spec (1.43 -> 1.44)
Diffs:
Index: SPECS/transmission.spec
diff -u SPECS/transmission.spec:1.43 SPECS/transmission.spec:1.44
--- SPECS/transmission.spec:1.43Sun Mar 29 13:24:10 2009
+++ SPECS/transmission.spec Sun Mar 29 13:25:26 2009
@@ -128,6 +128,7 @@
%{_appdir}/index.html
%files gui
+%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/transmission
%{_desktopdir}/transmission.desktop
%{_pixmapsdir}/transmission.png
@@ -140,6 +141,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.44 2009/03/29 11:25:26 charles
+- defattr for -gui
+
Revision 1.43 2009/03/29 11:24:10 charles
- cosmetic
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/transmission.spec?r1=1.43&r2=1.44&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: gnome-applets.spec - removed modemlights applet and added appropriat...
Author: megabajt Date: Sun Mar 29 11:43:13 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- removed modemlights applet and added appropriate Obsoletes
- release 2
Files affected:
SPECS:
gnome-applets.spec (1.214 -> 1.215)
Diffs:
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.214 SPECS/gnome-applets.spec:1.215
--- SPECS/gnome-applets.spec:1.214 Wed Mar 18 16:54:26 2009
+++ SPECS/gnome-applets.specSun Mar 29 13:43:08 2009
@@ -5,56 +5,56 @@
Summary(uk.UTF-8): Маленькі програми, що вбудовуються в панель GNOME
Name: gnome-applets
Version: 2.26.0
-Release: 1
+Release: 2
Epoch: 1
License: GPL v2, FDL
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-applets/2.26/%{name}-%{version}.tar.bz2
# Source0-md5: eed64366b0a1f4032506ac7221ce898a
# check paths in Makefile before removing it!
-Patch1:%{name}-m4_fix.patch
+Patch0:%{name}-m4_fix.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: GConf2-devel >= 2.26.0
+BuildRequires: NetworkManager-devel >= 0.7
BuildRequires: PolicyKit-gnome-devel >= 0.7
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
BuildRequires: cpufrequtils-devel >= 0.3
-BuildRequires: dbus-glib-devel >= 0.73
+BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: glib2-devel >= 1:2.20.0
BuildRequires: gnome-common >= 2.24.0
-BuildRequires: gnome-desktop-devel >= 2.24.0
+BuildRequires: gnome-desktop-devel >= 2.26.0
BuildRequires: gnome-doc-utils >= 0.14.0
-BuildRequires: gnome-icon-theme >= 2.24.0
-BuildRequires: gnome-panel-devel >= 2.24.0
-BuildRequires: gnome-settings-daemon-devel >= 2.24.0
+BuildRequires: gnome-icon-theme >= 2.26.0
+BuildRequires: gnome-panel-devel >= 2.26.0
+BuildRequires: gnome-settings-daemon-devel >= 2.26.0
BuildRequires: gstreamer-plugins-base-devel >= 0.10.10
-BuildRequires: gtk+2-devel >= 2:2.14.0
-BuildRequires: gucharmap-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.16.0
+BuildRequires: gucharmap-devel >= 2.26.0
BuildRequires: hal-devel >= 0.5.10
BuildRequires: intltool >= 0.40.0
-BuildRequires: libgnomekbd-devel >= 2.21.4.1
-BuildRequires: libgnomeui-devel >= 2.24.0
+BuildRequires: libgnomekbd-devel >= 2.24.0
BuildRequires: libgtop-devel >= 1:2.22.0
-BuildRequires: libgweather-devel >= 2.24.0
-BuildRequires: libnotify-devel >= 0.4.2
+BuildRequires: libgweather-devel >= 2.26.0
+BuildRequires: libnotify-devel >= 0.4.4
BuildRequires: libtool
-BuildRequires: libwnck-devel >= 2.24.0
+BuildRequires: libwnck-devel >= 2.26.0
BuildRequires: libxml2-devel >= 1:2.6.30
BuildRequires: libxslt-progs >= 1.1.20
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: python-devel >= 1:2.4
BuildRequires: python-gnome-desktop-devel
BuildRequires: python-gnome-devel >= 2.22.0
-BuildRequires: python-pygtk-devel >= 2:2.12.0
+BuildRequires: python-pygtk-devel >= 2:2.14.0
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(find_lang) >= 1.23
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: scrollkeeper >= 0.3.11-4
-Requires: gnome-icon-theme >= 2.24.0
-Requires: gnome-panel >= 2.24.0
+Requires: gnome-icon-theme >= 2.26.0
+Requires: gnome-panel >= 2.26.0
Requires: hicolor-icon-theme
-Requires: libgnomeui >= 2.24.0
+Obsoletes: gnome-applets-modemlights
# s...@latn vs. s...@latin
Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,7 +82,7 @@
Requires(post,postun): gtk+2
Requires(post,postun): scrollkeeper
Requires: %{name} = %{epoch}:%{version}-%{release}
-Suggests: gnome-control-center >= 2.24.0
+Suggests: gnome-control-center >= 2.26.0
Conflicts: gnome-applets <= 0:2.10.0-5
%description accessx-status
@@ -252,21 +252,6 @@
%description mixer -l pl.UTF-8
Aplet regulacji głośności.
-%package modemlights
-Summary: Modem Lights applet
-Summary(pl.UTF-8): Aplet kontrolek modemu
-Group: X11/Applications
-Requires(post,postun): gtk+2
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: system-tools-backends
-Conflicts: gnome-applets <= 0:2.10.0-5
-
-%description modemlights
-Modem Lights applet.
-
-%description modemlights -l pl.UTF-8
-Aplet kontrolek modemu.
-
%package multiload
Summary: System Monitor applet
Summary(pl.UTF-8): Aplet monitora systemu
@@ -316,7 +301,7 @@
%prep
%setup -q
-%patch1 -p1
+%patch0 -p1
%build
%{__gnome_doc_prepare}
@@ -332,8 +317,7 @@
--disable-static \
--disable-schemas-install \
--enable-mini-commander \
- --enable-mixer-applet \
- --with-gstreamer=0.10
+ --enable-mixer-applet
%{__make}
%install
@@ -485,12 +469,6
SPECS: gnome-games.spec - update hicolor icon cache in -sudoku post / postun
Author: megabajt Date: Sun Mar 29 11:48:25 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- update hicolor icon cache in -sudoku post / postun
Files affected:
SPECS:
gnome-games.spec (1.212 -> 1.213)
Diffs:
Index: SPECS/gnome-games.spec
diff -u SPECS/gnome-games.spec:1.212 SPECS/gnome-games.spec:1.213
--- SPECS/gnome-games.spec:1.212Wed Mar 18 18:36:00 2009
+++ SPECS/gnome-games.spec Sun Mar 29 13:48:19 2009
@@ -339,6 +339,7 @@
Summary: Simple interface for playing, saving, printing and solving
Sudoku
Summary(pl.UTF-8): Prosty interfejs do grania, zapisywania, drukowania i
rozwiązywania Sudoku
Group: X11/Applications/Games
+Requires(post,postun): gtk+2
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: python-gnome-desktop-print >= 2.22.0
Requires: python-gnome-gconf
@@ -709,6 +710,12 @@
%scrollkeeper_update_postun
%update_icon_cache hicolor
+%post sudoku
+%update_icon_cache hicolor
+
+%postun sudoku
+%update_icon_cache hicolor
+
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
@@ -890,6 +897,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.213 2009/03/29 11:48:19 megabajt
+- update hicolor icon cache in -sudoku post / postun
+
Revision 1.212 2009/03/18 17:36:00 megabajt
- merged from DEVEL
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-games.spec?r1=1.212&r2=1.213&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (LINUX_2_6): kernel.spec esfq needs fix
Author: arekmDate: Sun Mar 29 11:49:22 2009 GMT
Module: SPECS Tag: LINUX_2_6
Log message:
esfq needs fix
Files affected:
SPECS:
kernel.spec (1.441.2.2087 -> 1.441.2.2088)
Diffs:
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2087 SPECS/kernel.spec:1.441.2.2088
--- SPECS/kernel.spec:1.441.2.2087 Fri Mar 27 19:55:13 2009
+++ SPECS/kernel.spec Sun Mar 29 13:49:14 2009
@@ -811,8 +811,9 @@
%patch51 -p1
%endif
+# XXX: 2.6.29 fixme
# esfq
-%patch53 -p1
+# %patch53 -p1
%if %{with wrr}
%patch52 -p1
@@ -1677,6 +1678,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.441.2.2088 2009/03/29 11:49:14 arekm
+esfq needs fix
+
Revision 1.441.2.2087 2009/03/27 18:55:13 baggins
- mpt-fusion patch is NOT included upstream, just tiny bits of it
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.2087&r2=1.441.2.2088&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: ERRORS: linux-2.6.29.tar.bz2 patch-2.6.29.bz2 ccs-patch-1.6.6-20090202.tar.gz
FATAL: http://www.kernel.org/pub/linux/kernel/v2.6/patch-2.6.29.bz2 md5 mismatch, needed 27a43f76cf4b90db18df6d1c5e72789b, got 1764da3e3f5fe588e1c72376c60b47c1 Files fetched: 0 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 ALREADY GOT: http://globalbase.dl.sourceforge.jp/tomoyo/30297/ccs-patch-1.6.6-20090202.tar.gz cceb1731d3720030eac34ed128848b32 ccs-patch-1.6.6-20090202.tar.gz -- 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
SOURCES (LINUX_2_6): kernel-aufs.patch - partial fix
Author: arekmDate: Sun Mar 29 11:52:48 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- partial fix
Files affected:
SOURCES:
kernel-aufs.patch (1.1 -> 1.1.2.1)
Diffs:
Index: SOURCES/kernel-aufs.patch
diff -u SOURCES/kernel-aufs.patch:1.1 SOURCES/kernel-aufs.patch:1.1.2.1
--- SOURCES/kernel-aufs.patch:1.1 Fri Mar 13 00:08:15 2009
+++ SOURCES/kernel-aufs.patch Sun Mar 29 13:52:43 2009
@@ -7511,7 +7511,7 @@
+ if (nsi_lock)
+ si_read_unlock(parent->d_sb);
+ path_get(path);
-+ file = dentry_open(parent, path->mnt, au_dir_roflags);
++ file = dentry_open(parent, path->mnt, au_dir_roflags, current_cred());
+ dentry = (void *)file;
+ if (IS_ERR(file))
+ goto out;
@@ -8056,7 +8056,7 @@
+ if (file && au_test_nfs(h_dentry->d_sb))
+ h_file = au_h_intent(dentry, bindex, file);
+ if (!h_file)
-+ h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags);
++ h_file = dentry_open(dget(h_dentry), mntget(br->br_mnt), flags,
current_cred());
+
+ /*
+ * a dirty trick for handling FMODE_EXEC and deny_write_access().
@@ -28491,7 +28491,7 @@
+ goto out_dput;
+ }
+ file = dentry_open(dget(dentry), mntget(base_file->f_vfsmnt),
-+ O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE);
++ O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE,
current_cred());
+ if (IS_ERR(file)) {
+ AuErr("%.*s open err %ld\n", AuLNPair(name), PTR_ERR(file));
+ goto out_dput;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-aufs.patch?r1=1.1&r2=1.1.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
SOURCES (LINUX_2_6): linux-2.6-suspend2.patch New from http://www.tuxonice....
Author: arekmDate: Sun Mar 29 11:57:39 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
New from
http://www.tuxonice.net/downloads/all/current-tuxonice-for-head.patch-20090313-v1.bz2
Files affected:
SOURCES:
linux-2.6-suspend2.patch (1.1.2.2.2.16 -> 1.1.2.2.2.17)
Diffs:
Index: SOURCES/linux-2.6-suspend2.patch
diff -u SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.16
SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.17
--- SOURCES/linux-2.6-suspend2.patch:1.1.2.2.2.16 Sat Mar 14 10:24:08 2009
+++ SOURCES/linux-2.6-suspend2.patchSun Mar 29 13:57:33 2009
@@ -1235,10 +1235,10 @@
+ testing. His efforts have contributed as much to TuxOnIce as any of the
+ names above.
diff --git a/MAINTAINERS b/MAINTAINERS
-index fbc8fa5..b2b74f8 100644
+index 61aeb5a..4132787 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4233,6 +4233,13 @@ P: Maciej W. Rozycki
+@@ -4336,6 +4336,13 @@ P: Maciej W. Rozycki
M:ma...@linux-mips.org
S:Maintained
@@ -1253,10 +1253,10 @@
P:Dario Ballabio
M:ballabio_da...@emc.com
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
-index 2e664f3..cab7111 100644
+index 58bcaeb..f5e16a4 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
-@@ -397,6 +397,7 @@ void kernel_map_pages(struct page *page, int numpages, int
enable)
+@@ -388,6 +388,7 @@ void kernel_map_pages(struct page *page, int numpages, int
enable)
change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));
}
@@ -1265,10 +1265,10 @@
static int fixmaps;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index cc5a254..1216ab3 100644
+index 4526b3a..6851f01 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
-@@ -511,6 +511,7 @@ void machine_restart(char *cmd)
+@@ -605,6 +605,7 @@ void machine_restart(char *cmd)
{
machine_ops.restart(cmd);
}
@@ -1277,10 +1277,10 @@
void machine_halt(void)
{
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index f664bc1..359f62f 100644
+index 7233bd7..0079a2c 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
-@@ -1149,6 +1149,7 @@ void kernel_map_pages(struct page *page, int numpages,
int enable)
+@@ -1154,6 +1154,7 @@ void kernel_map_pages(struct page *page, int numpages,
int enable)
*/
__flush_tlb_all();
}
@@ -1288,7 +1288,7 @@
#ifdef CONFIG_HIBERNATION
-@@ -1163,7 +1164,7 @@ bool kernel_page_present(struct page *page)
+@@ -1168,7 +1169,7 @@ bool kernel_page_present(struct page *page)
pte = lookup_address((unsigned long)page_address(page), &level);
return (pte_val(*pte) & _PAGE_PRESENT);
}
@@ -1363,10 +1363,10 @@
}
+EXPORT_SYMBOL_GPL(arch_hibernation_header_restore);
diff --git a/crypto/Kconfig b/crypto/Kconfig
-index dc20a34..3d00017 100644
+index 8dde4fc..1867a5e 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
-@@ -287,6 +287,14 @@ config CRYPTO_MD5
+@@ -286,6 +286,14 @@ config CRYPTO_MD5
help
MD5 message digest algorithm (RFC1321).
@@ -1380,12 +1380,12 @@
+
config CRYPTO_MICHAEL_MIC
tristate "Michael MIC keyed digest algorithm"
- select CRYPTO_ALGAPI
+ select CRYPTO_HASH
diff --git a/crypto/Makefile b/crypto/Makefile
-index cd4a4ed..800eced 100644
+index 46b08bf..0cab903 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
-@@ -71,6 +71,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
+@@ -72,6 +72,7 @@ obj-$(CONFIG_CRYPTO_SALSA20) += salsa20_generic.o
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o
@@ -1726,7 +1726,7 @@
+MODULE_DESCRIPTION("LZF Compression Algorithm");
+MODULE_AUTHOR("Marc Alexander Lehmann & Nigel Cunningham");
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 692c20b..b7dfeea 100644
+index 2d14f4a..dc9ef3b 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -54,6 +54,7 @@ void device_pm_lock(void)
@@ -1746,7 +1746,7 @@
/**
*device_pm_add - add a device to the list of active devices
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
-index 008176e..7d67569 100644
+index 7900bd6..a5a8717 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -187,6 +187,7 @@ int fg_console;
@@ -1758,10 +1758,10 @@
/*
* For each existing display, we have a pointer to console currently visible
diff --git a/drivers/md/md.c b/drivers/md/md.c
-index fb15676..d6142dc 100644
+index a307f87..6eb04ea 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
-@@ -5595,7 +5595,6 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok)
+@@ -5778,7 +5778,6 @@ void md_done_sync(mddev_t *mddev, int blocks, int ok)
}
}
@@ -1769,7 +1769,7 @@
/* md_write_start(mddev, bi)
* If we need to update some array met
SPECS: NetworkManager-applet.spec - R: notification-daemon
Author: megabajt Date: Sun Mar 29 11:58:59 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- R: notification-daemon
Files affected:
SPECS:
NetworkManager-applet.spec (1.11 -> 1.12)
Diffs:
Index: SPECS/NetworkManager-applet.spec
diff -u SPECS/NetworkManager-applet.spec:1.11
SPECS/NetworkManager-applet.spec:1.12
--- SPECS/NetworkManager-applet.spec:1.11 Wed Dec 3 18:30:45 2008
+++ SPECS/NetworkManager-applet.specSun Mar 29 13:58:54 2009
@@ -28,6 +28,7 @@
Requires(post,postun): hicolor-icon-theme
Requires: NetworkManager >= 0.7.0
Requires: PolicyKit-gnome
+Requires: notification-daemon
Obsoletes: NetworkManager-applet-devel
# s...@latn vs. s...@latin
Conflicts: glibc-misc < 6:2.7
@@ -91,6 +92,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.12 2009/03/29 11:58:54 megabajt
+- R: notification-daemon
+
Revision 1.11 2008/12/03 17:30:45 megabajt
- own %{_datadir}/gnome-vpn-properties
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/NetworkManager-applet.spec?r1=1.11&r2=1.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
SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - from http://vserver.13thfloor....
Author: arekmDate: Sun Mar 29 12:05:51 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- from
http://vserver.13thfloor.at/Experimental/patch-2.6.29-vs2.3.0.36.9-pre1.diff
Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.55 -> 1.2.4.11.2.56)
Diffs:
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.56
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.55 Thu Feb 26 00:24:34 2009
+++ SOURCES/linux-2.6-vs2.3.patch Sun Mar 29 14:05:44 2009
@@ -1,7 +1,7 @@
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/Kconfig
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/Kconfig
linux-2.6.28.7/arch/alpha/Kconfig 2008-12-25 00:26:37.0 +0100
-+++ linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/Kconfig 2009-02-22
22:54:24.0 +0100
-@@ -665,6 +665,8 @@ config DUMMY_CONSOLE
+diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/Kconfig
+--- linux-2.6.29/arch/alpha/Kconfig2009-03-24 14:18:07.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/Kconfig 2009-03-24
14:48:16.0 +0100
+@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,10 +10,10 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/kernel/entry.S
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/entry.S
linux-2.6.28.7/arch/alpha/kernel/entry.S 2009-02-22 22:45:34.0
+0100
-+++ linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/entry.S 2009-02-22
22:54:24.0 +0100
-@@ -872,24 +872,15 @@ sys_getxgid:
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/entry.S
+--- linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.0
+0100
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/entry.S 2009-03-24
14:48:16.0 +0100
+@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.entsys_getxpid
sys_getxpid:
@@ -45,10 +45,10 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/kernel/osf_sys.c
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/osf_sys.c
linux-2.6.28.7/arch/alpha/kernel/osf_sys.c 2008-12-25 00:26:37.0
+0100
-+++ linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/osf_sys.c2009-02-22
22:54:24.0 +0100
-@@ -885,7 +885,7 @@ osf_gettimeofday(struct timeval32 __user
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.29/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.0
+0100
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/osf_sys.c 2009-03-24
14:48:16.0 +0100
+@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
struct timeval ktv;
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/kernel/ptrace.c
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/ptrace.c
linux-2.6.28.7/arch/alpha/kernel/ptrace.c 2008-12-25 00:26:37.0
+0100
-+++ linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/ptrace.c 2009-02-22
22:54:24.0 +0100
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/ptrace.c
+--- linux-2.6.29/arch/alpha/kernel/ptrace.c2008-12-25 00:26:37.0
+0100
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/ptrace.c 2009-02-22
22:54:24.0 +0100
@@ -15,6 +15,7 @@
#include
#include
@@ -68,9 +68,9 @@
#include
#include
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/kernel/systbls.S
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/systbls.S
linux-2.6.28.7/arch/alpha/kernel/systbls.S 2009-02-22 22:45:34.0
+0100
-+++ linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/systbls.S2009-02-22
22:54:24.0 +0100
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/systbls.S
+--- linux-2.6.29/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.0
+0100
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/systbls.S 2009-03-24
14:48:16.0 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.28.7/arch/alpha/kernel/traps.c
linux-2.6.28.7-vs2.3.0.36.7/arch/alpha/kernel/traps.c
linux-2.6.28.7/arch/alpha/kernel/traps.c 20
SOURCES (LINUX_2_6): kernel-unionfs-apparmor.patch - updated for .29
Author: arekmDate: Sun Mar 29 12:12:23 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- updated for .29
Files affected:
SOURCES:
kernel-unionfs-apparmor.patch (1.1.2.1 -> 1.1.2.2)
Diffs:
Index: SOURCES/kernel-unionfs-apparmor.patch
diff -u SOURCES/kernel-unionfs-apparmor.patch:1.1.2.1
SOURCES/kernel-unionfs-apparmor.patch:1.1.2.2
--- SOURCES/kernel-unionfs-apparmor.patch:1.1.2.1 Mon Nov 3 02:27:16 2008
+++ SOURCES/kernel-unionfs-apparmor.patch Sun Mar 29 14:12:17 2009
@@ -54,15 +54,15 @@
/*
* Selinux depends on "security.*" xattrs, so to maintain
* the security of copied-up files, if Selinux is active,
-@@ -93,8 +94,8 @@ static int copyup_xattrs(struct dentry *
-*/
- if (err == -EPERM && !capable(CAP_FOWNER)) {
- cap_raise(current->cap_effective, CAP_FOWNER);
+@@ -103,8 +103,8 @@
+ }
+ cap_raise(new_creds->cap_effective, CAP_FOWNER);
+ old_creds = override_creds(new_creds);
- err = vfs_setxattr(new_lower_dentry, name_list,
- attr_value, size, 0);
+ err = vfs_setxattr(new_lower_dentry, NULL, name_list,
+ attr_value, size, 0, NULL);
- cap_lower(current->cap_effective, CAP_FOWNER);
+ revert_creds(old_creds);
}
if (err < 0)
@@ -136,14 +136,14 @@ static int copyup_permissions(struct sup
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-unionfs-apparmor.patch?r1=1.1.2.1&r2=1.1.2.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
SPECS: gnome-desktop.spec - R: python-gnome, python-pygtk-gtk (for gnome-ab...
Author: megabajt Date: Sun Mar 29 11:54:22 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- R: python-gnome, python-pygtk-gtk (for gnome-about)
Files affected:
SPECS:
gnome-desktop.spec (1.128 -> 1.129)
Diffs:
Index: SPECS/gnome-desktop.spec
diff -u SPECS/gnome-desktop.spec:1.128 SPECS/gnome-desktop.spec:1.129
--- SPECS/gnome-desktop.spec:1.128 Wed Mar 18 12:51:24 2009
+++ SPECS/gnome-desktop.specSun Mar 29 13:54:17 2009
@@ -29,6 +29,8 @@
BuildRequires: xorg-lib-libXrandr-devel >= 1.2
Requires(post,postun): scrollkeeper
Requires: %{name}-libs = %{version}-%{release}
+Requires: python-gnome
+Requires: python-pygtk-gtk
Obsoletes: gnome-core
# s...@latn vs. s...@latin
Conflicts: glibc-misc < 6:2.7
@@ -177,6 +179,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.129 2009/03/29 11:54:17 megabajt
+- R: python-gnome, python-pygtk-gtk (for gnome-about)
+
Revision 1.128 2009/03/18 11:51:24 patrys
- merged from DEVEL
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-desktop.spec?r1=1.128&r2=1.129&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - up to pre2
Author: arekmDate: Sun Mar 29 12:31:57 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- up to pre2
Files affected:
SOURCES:
linux-2.6-vs2.3.patch (1.2.4.11.2.56 -> 1.2.4.11.2.57)
Diffs:
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.56
SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.57
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.56 Sun Mar 29 14:05:44 2009
+++ SOURCES/linux-2.6-vs2.3.patch Sun Mar 29 14:31:50 2009
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/Kconfig
+diff -NurpP --minimal linux-2.6.29/arch/alpha/Kconfig
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/Kconfig
--- linux-2.6.29/arch/alpha/Kconfig2009-03-24 14:18:07.0 +0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/Kconfig 2009-03-24
14:48:16.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/Kconfig 2009-03-24
14:48:16.0 +0100
@@ -666,6 +666,8 @@ config DUMMY_CONSOLE
depends on VGA_HOSE
default y
@@ -10,9 +10,9 @@
source "security/Kconfig"
source "crypto/Kconfig"
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/entry.S
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/entry.S
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/entry.S
--- linux-2.6.29/arch/alpha/kernel/entry.S 2009-03-24 14:18:07.0
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/entry.S 2009-03-24
14:48:16.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/entry.S 2009-03-24
14:48:16.0 +0100
@@ -874,24 +874,15 @@ sys_getxgid:
.globl sys_getxpid
.entsys_getxpid
@@ -45,9 +45,9 @@
ret
.end sys_getxpid
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/osf_sys.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/osf_sys.c
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/osf_sys.c
--- linux-2.6.29/arch/alpha/kernel/osf_sys.c 2009-03-24 14:18:07.0
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/osf_sys.c 2009-03-24
14:48:16.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/osf_sys.c 2009-03-24
14:48:16.0 +0100
@@ -877,7 +877,7 @@ SYSCALL_DEFINE2(osf_gettimeofday, struct
{
if (tv) {
@@ -57,9 +57,9 @@
if (put_tv32(tv, &ktv))
return -EFAULT;
}
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/ptrace.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/ptrace.c
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/ptrace.c
--- linux-2.6.29/arch/alpha/kernel/ptrace.c2008-12-25 00:26:37.0
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/ptrace.c 2009-02-22
22:54:24.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/ptrace.c 2009-02-22
22:54:24.0 +0100
@@ -15,6 +15,7 @@
#include
#include
@@ -68,9 +68,9 @@
#include
#include
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/systbls.S
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/systbls.S
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/systbls.S
--- linux-2.6.29/arch/alpha/kernel/systbls.S 2009-03-24 14:18:08.0
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/systbls.S 2009-03-24
14:48:16.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/systbls.S 2009-03-24
14:48:16.0 +0100
@@ -446,7 +446,7 @@ sys_call_table:
.quad sys_stat64/* 425 */
.quad sys_lstat64
@@ -80,9 +80,9 @@
.quad sys_ni_syscall/* sys_mbind */
.quad sys_ni_syscall/* sys_get_mempolicy */
.quad sys_ni_syscall/* sys_set_mempolicy */
-diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c
linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/traps.c
+diff -NurpP --minimal linux-2.6.29/arch/alpha/kernel/traps.c
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/traps.c
--- linux-2.6.29/arch/alpha/kernel/traps.c 2008-12-25 00:26:37.0
+0100
-+++ linux-2.6.29-vs2.3.0.36.9-pre1/arch/alpha/kernel/traps.c 2009-02-22
22:54:24.0 +0100
linux-2.6.29-vs2.3.0.36.9-pre2/arch/alpha/kernel/traps.c 2009-02-22
22:54:24.0 +0100
@@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
#ifdef CONFIG_SMP
printk("CPU %d ", hard_smp_processor_id());
@@ -93,9 +93,9 @@
dik_show_regs(regs, r9_15);
add_taint(TAINT_DIE);
dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-2.6.29/arch/alpha/mm/faul
SPECS: miniupnpd.spec - up to 1.2, still doesn't compile
Author: glen Date: Sun Mar 29 12:46:08 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 1.2, still doesn't compile
Files affected:
SPECS:
miniupnpd.spec (1.3 -> 1.4)
Diffs:
Index: SPECS/miniupnpd.spec
diff -u SPECS/miniupnpd.spec:1.3 SPECS/miniupnpd.spec:1.4
--- SPECS/miniupnpd.spec:1.3Thu May 17 20:41:46 2007
+++ SPECS/miniupnpd.specSun Mar 29 14:46:02 2009
@@ -1,21 +1,29 @@
# $Revision$, $Date$
-%define pre RC4
+# TODO
+# - iptables or kernel headers messup:
+# - th:
+# linux/iptcrdr.c:17:22: error: iptables.h: No such file or directory
+# linux/iptcrdr.c:18:41: error: linux/netfilter_ipv4/ip_nat.h: No such file
or directory
+# linux/iptcrdr.c: In function 'get_redirect_rule':
+# - ac:
+# netfilter/iptcrdr.c:23:36: linux/netfilter/nf_nat.h: No such file or
directory
Summary: Small UPnP Daemon
Summary(pl.UTF-8): Mały demon UPnP
Name: miniupnpd
-Version: 1.0
-Release: 0.%{pre}.1
+Version: 1.2
+Release: 0.1
License: BSD
Group: Applications
-Source0: http://miniupnp.free.fr/files/%{name}-%{version}-RC4.tar.gz
-# Source0-md5: de6fd266bf15c4f6781895d19c8efbca
+Source0: http://miniupnp.tuxfamily.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: 48f1fa81e5c2cb1c561c29cdcf261602
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.conf
-URL: http://miniupnp.free.fr/
+URL: http://miniupnp.tuxfamily.org/
BuildRequires: iptables-devel
BuildRequires: rpmbuild(macros) >= 1.228
Requires(post):libuuid
+Requires(post):sed >= 4.0
Requires(post,preun): /sbin/chkconfig
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -26,7 +34,7 @@
Mały demon UPnP.
%prep
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -q
%build
%{__make} -f Makefile.linux \
@@ -36,7 +44,6 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{_sbindir},/etc/rc.d/init.d,/etc/sysconfig,%{_sysconfdir}/%{name}}
-
install miniupnpd $RPM_BUILD_ROOT%{_sbindir}
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
@@ -46,17 +53,17 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ ! -f %{_sysconfdir}/miniupnpd/uuid ] ; then
+if [ ! -f %{_sysconfdir}/miniupnpd/uuid ]; then
echo "Generating UPnP uuid..."
umask 066
uuidgen > %{_sysconfdir}/miniupnpd/uuid
fi
-if [ -f %{_sysconfdir}/miniupnpd/uuid ] ; then
+if [ -f %{_sysconfdir}/miniupnpd/uuid ]; then
UUID=`cat %{_sysconfdir}/miniupnpd/uuid`
if [ -n "$UUID" ] ; then
echo "Updating UUID in miniupnpd config file..."
- %{__sed} -i -e "s/^uuid=[-0-9a-f]*/uuid=`cat
%{_sysconfdir}/miniupnpd/uuid`/" %{_sysconfdir}/miniupnpd/miniupnpd.conf
+ %{__sed} -i -e "s/^uuid=[-0-9a-f]*/uuid=`cat
%{_sysconfdir}/miniupnpd/uuid`/" %{_sysconfdir}/miniupnpd/miniupnpd.conf
fi
fi
@@ -84,6 +91,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.4 2009/03/29 12:46:02 glen
+- up to 1.2, still doesn't compile
+
Revision 1.3 2007/05/17 18:41:46 qboosh
- use optflags
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/miniupnpd.spec?r1=1.3&r2=1.4&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: miniupnpd-1.2.tar.gz
Files fetched: 1 STORED: http://miniupnp.tuxfamily.org/files/miniupnpd-1.2.tar.gz 48f1fa81e5c2cb1c561c29cdcf261602 miniupnpd-1.2.tar.gz Size: 81025 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
DISTFILES: miniupnpc-1.2.tar.gz
Files fetched: 1 STORED: http://miniupnp.tuxfamily.org/files/miniupnpc-1.2.tar.gz 004864b69d2fbdb787e56c095607f6dd miniupnpc-1.2.tar.gz Size: 38787 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
SPECS: miniupnpc.spec (NEW) - new
Author: glen Date: Sun Mar 29 13:09:00 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- new
Files affected:
SPECS:
miniupnpc.spec (NONE -> 1.1) (NEW)
Diffs:
Index: SPECS/miniupnpc.spec
diff -u /dev/null SPECS/miniupnpc.spec:1.1
--- /dev/null Sun Mar 29 15:09:00 2009
+++ SPECS/miniupnpc.specSun Mar 29 15:08:55 2009
@@ -0,0 +1,112 @@
+# $Revision$, $Date$
+Summary: MiniUPnP client and a library
+Name: miniupnpc
+Version: 1.2
+Release: 0.1
+License: BSD
+Group: Libraries
+Source0: http://miniupnp.tuxfamily.org/files/%{name}-%{version}.tar.gz
+# Source0-md5: 004864b69d2fbdb787e56c095607f6dd
+URL: http://miniupnp.tuxfamily.org/
+BuildRequires: python-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+MiniUPnP client and a library
+
+%package devel
+Summary: Header files for miniupnpc library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki miniupnpc
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header files for miniupnpc library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki miniupnpc.
+
+%package static
+Summary: Static miniupnpc library
+Summary(pl.UTF-8): Statyczna biblioteka miniupnpc
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static miniupnpc library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka miniupnpc.
+
+%package -n python-miniupnpc
+Summary: Python binding for miniupnpc library
+Group: Development/Languages/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-miniupnpc
+Python binding for miniupnpc library.
+
+%prep
+%setup -q
+
+%build
+%{__make} \
+ CC="%{__cc}" \
+ CFLAGS="%{rpmcflags} -fPIC -Wall -DNDEBUG"
+
+export CFLAGS="%{rpmcflags}"
+%{__python} setup.py build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_mandir}/man3
+%{__make} install \
+ INSTALLPREFIX=$RPM_BUILD_ROOT%{_prefix}
+
+# let SONAME be the symlink
+mv $RPM_BUILD_ROOT%{_libdir}/libminiupnpc.so.{3,3.0.0}
+ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+
+cp -a man3/miniupnpc.3 $RPM_BUILD_ROOT%{_mandir}/man3
+
+%{__python} setup.py install \
+ --optimize=2 \
+ --root=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc Changelog.txt README LICENCE
+%attr(755,root,root) %{_bindir}/upnpc
+%attr(755,root,root) %{_libdir}/libminiupnpc.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libminiupnpc.so.3
+
+%files devel
+%defattr(644,root,root,755)
+%doc upnpc.c
+%{_libdir}/libminiupnpc.so
+%{_includedir}/miniupnpc
+%{_mandir}/man3/miniupnpc.3*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libminiupnpc.a
+
+%files -n python-miniupnpc
+%defattr(644,root,root,755)
+%doc pymoduletest.py testupnpigd.py
+%{py_sitedir}/miniupnpc.so
+
+%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 2009/03/29 13:08:55 glen
+- new
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: template-python.spec - .egg-info is python version specific (and som...
Author: glen Date: Sun Mar 29 13:11:28 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- .egg-info is python version specific (and sometimes setup.py), not distro line
Files affected:
SPECS:
template-python.spec (1.14 -> 1.15)
Diffs:
Index: SPECS/template-python.spec
diff -u SPECS/template-python.spec:1.14 SPECS/template-python.spec:1.15
--- SPECS/template-python.spec:1.14 Mon Feb 16 14:11:14 2009
+++ SPECS/template-python.spec Sun Mar 29 15:11:22 2009
@@ -48,7 +48,7 @@
%doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
%{py_sitedir}/*.py[co]
%attr(755,root,root) %{py_sitedir}/*.so
-%if "%{pld_release}" != "ac"
+%if "%{py_ver}" > "2.4"
%{py_sitedir}/TEMPLATE-*.egg-info
%endif
@@ -58,6 +58,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.15 2009/03/29 13:11:22 glen
+- .egg-info is python version specific (and sometimes setup.py), not distro
line
+
Revision 1.14 2009/02/16 13:11:14 lisu
- polish desc
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/template-python.spec?r1=1.14&r2=1.15&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: miniupnpc.spec - package .egg-info for py 2.6
Author: glen Date: Sun Mar 29 13:12:41 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- package .egg-info for py 2.6
Files affected:
SPECS:
miniupnpc.spec (1.1 -> 1.2)
Diffs:
Index: SPECS/miniupnpc.spec
diff -u SPECS/miniupnpc.spec:1.1 SPECS/miniupnpc.spec:1.2
--- SPECS/miniupnpc.spec:1.1Sun Mar 29 15:08:55 2009
+++ SPECS/miniupnpc.specSun Mar 29 15:12:36 2009
@@ -101,6 +101,9 @@
%defattr(644,root,root,755)
%doc pymoduletest.py testupnpigd.py
%{py_sitedir}/miniupnpc.so
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/miniupnpc-*.egg-info
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -108,5 +111,8 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.2 2009/03/29 13:12:36 glen
+- package .egg-info for py 2.6
+
Revision 1.1 2009/03/29 13:08:55 glen
- new
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/miniupnpc.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
poldek: poldek/po/pl.po - few translations (LP#337444)
Author: glen Date: Sun Mar 29 13:21:17 2009 GMT Module: poldekTag: HEAD Log message: - few translations (LP#337444) Files affected: poldek/poldek/po: pl.po (1.64 -> 1.65) Diffs: Index: poldek/poldek/po/pl.po diff -u poldek/poldek/po/pl.po:1.64 poldek/poldek/po/pl.po:1.65 --- poldek/poldek/po/pl.po:1.64 Tue Mar 3 23:19:43 2009 +++ poldek/poldek/po/pl.po Sun Mar 29 15:21:12 2009 @@ -58,12 +58,12 @@ #: ask.c:106 #, c-format msgid "%s: required \"%s\" is provided by following packages:" -msgstr "" +msgstr "%s: Wymagany \"%s\" jest dostarczany przez nast�puj�ce pakiety:" #: ask.c:109 #, c-format msgid "Required \"%s\" is provided by following packages:" -msgstr "" +msgstr "Wymagany \"%s\" jest dostarczany przez nast�puj�ce pakiety:" #: ask.c:128 #, c-format @@ -1287,7 +1287,7 @@ #: install-dist.c:119 #, c-format msgid "Installing #%d package of total %d (%s left to get)\n" -msgstr "" +msgstr "Instalacja #%d pakietu z %d (%s pozosta�o do pobrania)\n" #: install-dist.c:172 msgid "Interrupted" @@ -1966,7 +1966,7 @@ #: pkgset.c:611 msgid "version mismatch" -msgstr "" +msgstr "niezgodno�� wersji" #: pkgset.c:611 msgid "not found" @@ -2013,7 +2013,7 @@ #: pm/pset/pset.c:603 #, c-format msgid "Copying %s to %s" -msgstr "" +msgstr "Kopiowanie %s do %s" #: pm/pset/pset.c:646 #, fuzzy, c-format @@ -2224,7 +2224,7 @@ #: poldek_ts.c:855 msgid "to remove" -msgstr "" +msgstr "aby usun��" #: poldek_ts.c:873 #, fuzzy, c-format @@ -2245,7 +2245,7 @@ #: poldek_ts.c:882 #, c-format msgid ", %d to remove" -msgstr "" +msgstr ", %d aby usun��" #: poldek_ts.c:1038 msgid "Verifying dependencies..." CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/poldek/poldek/po/pl.po?r1=1.64&r2=1.65&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: swfdec-gnome-2.26.0.tar.bz2
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/swfdec-gnome/2.26/swfdec-gnome-2.26.0.tar.bz2 53d611d9a76a06a703650c4b73fd44cc swfdec-gnome-2.26.0.tar.bz2 Size: 193839 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
SPECS: swfdec-gnome.spec - updated to 2.26.0
Author: megabajt Date: Sun Mar 29 13:27:30 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 2.26.0
Files affected:
SPECS:
swfdec-gnome.spec (1.8 -> 1.9)
Diffs:
Index: SPECS/swfdec-gnome.spec
diff -u SPECS/swfdec-gnome.spec:1.8 SPECS/swfdec-gnome.spec:1.9
--- SPECS/swfdec-gnome.spec:1.8 Mon Oct 13 13:43:15 2008
+++ SPECS/swfdec-gnome.spec Sun Mar 29 15:27:25 2009
@@ -2,18 +2,18 @@
Summary: GNOME integration for swfdec Flash rendering library
Summary(pl.UTF-8): Integracja z GNOME biblioteki renderującej animacje
Flash swfdec
Name: swfdec-gnome
-Version: 2.24.0
+Version: 2.26.0
Release: 1
License: GPL v2+
Group: X11/Applications/Multimedia
-Source0:
http://download.gnome.org/sources/swfdec-gnome/2.24/%{name}-%{version}.tar.gz
-# Source0-md5: 1f411dd0012e907de6f3f94f696ca7fa
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/swfdec-gnome/2.26/%{name}-%{version}.tar.bz2
+# Source0-md5: 53d611d9a76a06a703650c4b73fd44cc
URL: http://swfdec.freedesktop.org/wiki/
-# just gconftool-2
-BuildRequires: GConf2
+BuildRequires: GConf2-devel
BuildRequires: autoconf >= 2.58
BuildRequires: automake >= 1:1.6
-BuildRequires: gnome-common >= 2.0
+BuildRequires: gettext-devel
+BuildRequires: gnome-common >= 2.26.0
BuildRequires: gtk+2-devel >= 2:2.12.0
BuildRequires: intltool >= 0.35.0
BuildRequires: libtool
@@ -22,8 +22,9 @@
BuildRequires: swfdec-devel >= 0.8.0
BuildRequires: swfdec-gtk-devel >= 0.8.0
# for thumbnailer
-Requires(post,preun): GConf2
+Requires(post,postun): gtk+2
Requires(post,postun): hicolor-icon-theme
+Requires(post,preun): GConf2
Requires: swfdec-gtk >= 0.8.0
Obsoletes: swfdec-icons <= 0.7.4
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -98,6 +99,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2009/03/29 13:27:25 megabajt
+- updated to 2.26.0
+
Revision 1.8 2008/10/13 11:43:15 sls
- __intltoolize
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/swfdec-gnome.spec?r1=1.8&r2=1.9&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: tre.spec - adapterized; release 1
Author: adamgDate: Sun Mar 29 13:28:58 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- adapterized; release 1
Files affected:
SPECS:
tre.spec (1.3 -> 1.4)
Diffs:
Index: SPECS/tre.spec
diff -u SPECS/tre.spec:1.3 SPECS/tre.spec:1.4
--- SPECS/tre.spec:1.3 Sat Mar 31 21:15:09 2007
+++ SPECS/tre.spec Sun Mar 29 15:28:52 2009
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): grep z wyszukiwaniem przybliżonym
Name: tre
Version: 0.7.5
-Release: 0.4
+Release: 1
License: LGPL
Group: Applications
Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
@@ -20,14 +20,13 @@
approximate regexp matching in the style of grep.
%description -l pl.UTF-8
-TRE jest lekką i wydajną biblioteką dopasowań przy użyciu
-wyrażeń regularnych, zgodną ze standardem POSIX oraz oferującą
-kilka przydatnych funkcji, jak np. dopasowywanie przybliżone
-(rozmyte).
+TRE jest lekką i wydajną biblioteką dopasowań przy użyciu wyrażeń
+regularnych, zgodną ze standardem POSIX oraz oferującą kilka
+przydatnych funkcji, jak np. dopasowywanie przybliżone (rozmyte).
Pakiet zawiera także narzędzie agrep (przybliżony grep) do
-przybliżonego dopasowywania przy użyciu wyrażeń regularnych w
-stylu grepa.
+przybliżonego dopasowywania przy użyciu wyrażeń regularnych w stylu
+grepa.
%package devel
Summary: Header files for tre library
@@ -82,6 +81,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.4 2009/03/29 13:28:52 adamg
+- adapterized; release 1
+
Revision 1.3 2007/03/31 19:15:09 qboosh
- finished pl
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tre.spec?r1=1.3&r2=1.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - update for our .29
Author: arekmDate: Sun Mar 29 13:32:11 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- update for our .29
Files affected:
SOURCES:
linux-2.6-grsec_full.patch (1.1.2.55 -> 1.1.2.56)
Diffs:
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.55
SOURCES/linux-2.6-grsec_full.patch:1.1.2.56
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.55 Thu Feb 12 21:53:14 2009
+++ SOURCES/linux-2.6-grsec_full.patch Sun Mar 29 15:32:04 2009
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.28/arch/alpha/include/asm/elf.h
linux-2.6.28/arch/alpha/include/asm/elf.h
linux-2.6.28/arch/alpha/include/asm/elf.h 2008-12-24 18:26:37.0
-0500
-+++ linux-2.6.28/arch/alpha/include/asm/elf.h 2009-01-11 07:20:06.0
-0500
+diff -urNp linux-2.6.29/arch/alpha/include/asm/elf.h
linux-2.6.29/arch/alpha/include/asm/elf.h
+--- linux-2.6.29/arch/alpha/include/asm/elf.h 2009-03-23 19:12:14.0
-0400
linux-2.6.29/arch/alpha/include/asm/elf.h 2009-03-28 14:26:18.0
-0400
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x100)
@@ -15,9 +15,9 @@
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.28/arch/alpha/include/asm/kmap_types.h
linux-2.6.28/arch/alpha/include/asm/kmap_types.h
linux-2.6.28/arch/alpha/include/asm/kmap_types.h 2008-12-24
18:26:37.0 -0500
-+++ linux-2.6.28/arch/alpha/include/asm/kmap_types.h 2009-01-11
07:20:06.0 -0500
+diff -urNp linux-2.6.29/arch/alpha/include/asm/kmap_types.h
linux-2.6.29/arch/alpha/include/asm/kmap_types.h
+--- linux-2.6.29/arch/alpha/include/asm/kmap_types.h 2009-03-23
19:12:14.0 -0400
linux-2.6.29/arch/alpha/include/asm/kmap_types.h 2009-03-28
14:26:18.0 -0400
@@ -24,7 +24,8 @@ D(9) KM_IRQ0,
D(10) KM_IRQ1,
D(11) KM_SOFTIRQ0,
@@ -28,9 +28,9 @@
};
#undef D
-diff -urNp linux-2.6.28/arch/alpha/include/asm/pgtable.h
linux-2.6.28/arch/alpha/include/asm/pgtable.h
linux-2.6.28/arch/alpha/include/asm/pgtable.h 2008-12-24
18:26:37.0 -0500
-+++ linux-2.6.28/arch/alpha/include/asm/pgtable.h 2009-01-11
07:20:06.0 -0500
+diff -urNp linux-2.6.29/arch/alpha/include/asm/pgtable.h
linux-2.6.29/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.29/arch/alpha/include/asm/pgtable.h 2009-03-23
19:12:14.0 -0400
linux-2.6.29/arch/alpha/include/asm/pgtable.h 2009-03-28
14:26:18.0 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -49,9 +49,9 @@
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE |
_PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.28/arch/alpha/kernel/module.c
linux-2.6.28/arch/alpha/kernel/module.c
linux-2.6.28/arch/alpha/kernel/module.c2008-12-24 18:26:37.0
-0500
-+++ linux-2.6.28/arch/alpha/kernel/module.c2009-01-11 07:20:06.0
-0500
+diff -urNp linux-2.6.29/arch/alpha/kernel/module.c
linux-2.6.29/arch/alpha/kernel/module.c
+--- linux-2.6.29/arch/alpha/kernel/module.c2009-03-23 19:12:14.0
-0400
linux-2.6.29/arch/alpha/kernel/module.c2009-03-28 14:26:18.0
-0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -61,10 +61,10 @@
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.28/arch/alpha/kernel/osf_sys.c
linux-2.6.28/arch/alpha/kernel/osf_sys.c
linux-2.6.28/arch/alpha/kernel/osf_sys.c 2008-12-24 18:26:37.0
-0500
-+++ linux-2.6.28/arch/alpha/kernel/osf_sys.c 2009-01-11 07:20:06.0
-0500
-@@ -1230,6 +1230,10 @@ arch_get_unmapped_area(struct file *filp
+diff -urNp linux-2.6.29/arch/alpha/kernel/osf_sys.c
linux-2.6.29/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.29/arch/alpha/kernel/osf_sys.c 2009-03-23 19:12:14.0
-0400
linux-2.6.29/arch/alpha/kernel/osf_sys.c 2009-03-28 14:26:18.0
-0400
+@@ -1217,6 +1217,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -75,7 +75,7 @@
if (addr) {
addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
if (addr != (unsigned long) -ENOMEM)
-@@ -1237,8 +1241,8 @@ arch_get_unmapped_area(struct file *filp
+@@ -1224,8 +1228,8 @@ arch_get_unmapped
SPECS: patch.spec - rel 8; upcoming patch (versioning is broken in new pkg)
Author: arekmDate: Sun Mar 29 13:46:18 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- rel 8; upcoming patch (versioning is broken in new pkg)
Files affected:
SPECS:
patch.spec (1.63 -> 1.64)
Diffs:
Index: SPECS/patch.spec
diff -u SPECS/patch.spec:1.63 SPECS/patch.spec:1.64
--- SPECS/patch.spec:1.63 Tue Nov 25 15:15:42 2008
+++ SPECS/patch.specSun Mar 29 15:46:13 2009
@@ -8,17 +8,14 @@
Summary(uk.UTF-8): Утиліта GNU patch, для модифікації/апгрейду файлів
Name: patch
Version: 2.5.9
-Release: 7
+Release: 8
License: GPL
Group: Applications/Text
# old/so-called-stable versions in ftp://ftp.gnu.org/gnu/patch/
-#Source0: ftp://alpha.gnu.org/gnu/patch/%{name}-%{version}.tar.gz
-Source0: ftp://alpha.gnu.org/gnu/diffutils/%{name}-%{version}.tar.gz
-# Source0-md5: dacfb618082f8d3a2194601193cf8716
+Source0: ftp://alpha.gnu.org/gnu/patch/%{name}-2.5.7-52-gddea3f3.tar.gz
+# Source0-md5: 06b27d6a05cc3ec9666bd5f566696e76
Source1: %{name}.1.pl
-Patch0:%{name}-stderr.patch
-Patch1:%{name}-sigsegv.patch
-URL: http://www.gnu.org/software/patch/patch.html
+URL: http://www.gnu.org/software/patch/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -69,9 +66,7 @@
використовуючи 'patch', отримати в себе модифіковану версію файлу.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-2.5.7-52-gddea3f3
%build
%{__aclocal} -I m4
@@ -108,6 +103,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.64 2009/03/29 13:46:13 arekm
+- rel 8; upcoming patch (versioning is broken in new pkg)
+
Revision 1.63 2008/11/25 14:15:42 arekm
- release 7
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/patch.spec?r1=1.63&r2=1.64&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: patch-2.5.7-52-gddea3f3.tar.gz
Files fetched: 1 STORED: ftp://alpha.gnu.org/gnu/patch/patch-2.5.7-52-gddea3f3.tar.gz 06b27d6a05cc3ec9666bd5f566696e76 patch-2.5.7-52-gddea3f3.tar.gz Size: 224654 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
SPECS: gmpc-plugin-jamendo.spec (NEW) - initial
Author: wigetDate: Sun Mar 29 14:01:01 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- initial
Files affected:
SPECS:
gmpc-plugin-jamendo.spec (NONE -> 1.1) (NEW)
Diffs:
Index: SPECS/gmpc-plugin-jamendo.spec
diff -u /dev/null SPECS/gmpc-plugin-jamendo.spec:1.1
--- /dev/null Sun Mar 29 16:01:01 2009
+++ SPECS/gmpc-plugin-jamendo.spec Sun Mar 29 16:00:56 2009
@@ -0,0 +1,66 @@
+# $Revision$, $Date$
+%definesource_name gmpc-jamendo
+Summary: Jamendo plugin for Gnome Music Player Client
+Summary(pl.UTF-8): Wtyczka udostępniająca dane z Jamendo dla odtwarzacza
Gnome Music Player Client
+Name: gmpc-plugin-jamendo
+Version: 0.18.0
+Release: 0.1
+License: GPL v2+
+Group: X11/Applications/Sound
+Source0:
http://dl.sourceforge.net/musicpd/%{source_name}-%{version}.tar.gz
+# Source0-md5: d77583b8952917336b8efb83752189ad
+URL: http://gmpc.wikia.com/wiki/GMPC_PLUGIN_JAMENDO
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: gmpc-devel >= 0.18.0
+BuildRequires: gob2 >= 2.0.10
+BuildRequires: gtk+2-devel >= 2:2.4
+BuildRequires: libglade2-devel
+BuildRequires: libmpd-devel >= 0.18.0
+BuildRequires: libtool
+BuildRequires: libxml2-devel >= 2.0
+BuildRequires: pkgconfig
+BuildRequires: sqlite3-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Browse and listen to music from Jamendo service.
+
+%prep
+%setup -q -n %{source_name}-%{version}
+
+%build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+%configure
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_libdir}/gmpc
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT%{_libdir}/gmpc/plugins/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gmpc/plugins/*.so
+
+%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 2009/03/29 14:00:56 wiget
+- initial
+
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gmpc-jamendo-0.18.0.tar.gz
Files fetched: 1 STORED: http://master.dl.sourceforge.net/musicpd/gmpc-jamendo-0.18.0.tar.gz d77583b8952917336b8efb83752189ad gmpc-jamendo-0.18.0.tar.gz Size: 308586 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
SOURCES: elinks-fbterm.patch (NEW) - support for fbterm
Author: witekfl Date: Sun Mar 29 14:07:55 2009 GMT
Module: SOURCES Tag: HEAD
Log message:
- support for fbterm
Files affected:
SOURCES:
elinks-fbterm.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/elinks-fbterm.patch
diff -u /dev/null SOURCES/elinks-fbterm.patch:1.1
--- /dev/null Sun Mar 29 16:07:57 2009
+++ SOURCES/elinks-fbterm.patch Sun Mar 29 16:07:50 2009
@@ -0,0 +1,223 @@
+commit e23a8ec12164af00922751aea0dfa285d3e240b4
+Author: Witold Filipczyk
+Date: Fri Mar 27 19:44:46 2009 +0100
+
+Support for fbterm.
+
+fbterm uses different 256 color sequences than xterm.
+color256_seqs are part of the driver info.
+
+diff --git a/src/config/options.c b/src/config/options.c
+index 14ab8db..00c9a25 100644
+--- a/src/config/options.c
b/src/config/options.c
+@@ -703,6 +703,9 @@ register_autocreated_options(void)
+ get_opt_int("terminal.xterm-256color.type") = 1;
+ get_opt_int("terminal.xterm-256color.colors") = COLOR_MODE_256;
+ get_opt_bool("terminal.xterm-256color.underline") = 1;
++ get_opt_int("terminal.fbterm.type") = 5;
++ get_opt_int("terminal.fbterm.colors") = COLOR_MODE_256;
++ get_opt_bool("terminal.fbterm.underline") = 1;
+ #endif
+ }
+
+diff --git a/src/config/options.inc b/src/config/options.inc
+index b9c6a7f..c4e4a9b 100644
+--- a/src/config/options.inc
b/src/config/options.inc
+@@ -879,20 +879,22 @@ static struct option_info config_options_info[] = {
+* 4 (TERM_FREEBSD) outputs characters in the 0x80...0x9F
+* range, which FreeBSD 4.0 (but not 5.0) treated as
+* graphical.
++ * 5 (TERM_FBTERM)
+*
+* When UTF-8 I/O is enabled, ELinks outputs (almost) the same
+* characters as above but encodes them in UTF-8 and does not
+* switch charsets. So, it will work in any terminal that
+* understands UTF-8 and has the characters in its font. */
+ INIT_OPT_INT("terminal._template_", N_("Type"),
+- "type", 0, 0, 4, 0,
++ "type", 0, 0, 5, 0,
+ N_("Terminal type; matters mostly only when drawing frames "
+ "and dialog box borders:\n"
+ "0 is dumb terminal type, ASCII art\n"
+ "1 is VT100, simple but portable\n"
+ "2 is Linux, you get double frames and other goodies\n"
+ "3 is KOI-8\n"
+- "4 is FreeBSD")),
++ "4 is FreeBSD\n"
++ "5 is fbterm")),
+
+ INIT_OPT_BOOL("terminal._template_", N_("Always encode xterm title in
ISO-8859-1"),
+ "latin1_title", 0, 1,
+diff --git a/src/terminal/screen.c b/src/terminal/screen.c
+index 8f838a6..bb3cbb1 100644
+--- a/src/terminal/screen.c
b/src/terminal/screen.c
+@@ -189,6 +189,19 @@ static const struct string underline_seqs[] = {
+ *
+ * @todo TODO: termcap/terminfo can maybe gradually be introduced via
+ * this structure. We'll see. --jonas */
++
++#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
++static const struct string color256_seqs[] = {
++ /* foreground: */ TERM_STRING("\033[0;38;5;%dm"),
++ /* background: */ TERM_STRING("\033[48;5;%dm"),
++};
++
++static const struct string fbterm_color256_seqs[] = {
++ /* foreground: */ TERM_STRING("\033[m\033[1;%d}"),
++ /* background: */ TERM_STRING("\033[2;%d}"),
++};
++#endif
++
+ struct screen_driver {
+ LIST_HEAD(struct screen_driver);
+
+@@ -215,6 +228,9 @@ struct screen_driver {
+ /** The color mode */
+ enum color_mode color_mode;
+
++#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
++ const struct string *color256_seqs;
++#endif
+ /** These are directly derived from the terminal options. */
+ unsigned int transparent:1;
+
+@@ -237,6 +253,9 @@ static const struct screen_driver_opt
dumb_screen_driver_opt = {
+ /* frame_seqs: */ NULL,
+ /* underline: */underline_seqs,
+ /* color_mode: */ COLOR_MODE_16,
++#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
++ /* 256 colors: */ color256_seqs,
++#endif
+ /* transparent: */ 1,
+ #ifdef CONFIG_UTF8
+ /* utf8_cp: */ 0,
+@@ -250,6 +269,9 @@ static const struct screen_driver_opt
vt100_screen_driver_opt = {
+ /* frame_seqs: */ vt100_frame_seqs,
+ /* underline: */underline_seqs,
+ /* color_mode: */ COLOR_MODE_16,
++#if defined(CONFIG_88_COLORS) || defined(CONFIG_256_COLORS)
++ /* 256 colors: */ color256_seqs,
++#endif
+ /* transparent: */ 1,
+ #ifdef CONFIG_UTF8
+ /* utf8_cp: */ 0,
+@@ -263,6 +285,9 @@ static const struct screen_driver_opt
linux_screen_driver_opt = {
+ /* frame_seqs: */ NULL, /* No m11_hack
SPECS: elinks.spec - up to 0.12pre3 - BR: tre-devel for wide chars regex se...
Author: witekfl Date: Sun Mar 29 14:08:58 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 0.12pre3
- BR: tre-devel for wide chars regex search
- added the fbterm.patch
Files affected:
SPECS:
elinks.spec (1.164 -> 1.165)
Diffs:
Index: SPECS/elinks.spec
diff -u SPECS/elinks.spec:1.164 SPECS/elinks.spec:1.165
--- SPECS/elinks.spec:1.164 Fri Mar 13 22:49:15 2009
+++ SPECS/elinks.spec Sun Mar 29 16:08:52 2009
@@ -26,25 +26,26 @@
%undefine with_openssl
%endif
#
-%definepre pre2
+%definepre pre3
Summary: Experimantal Links (text WWW browser)
Summary(es.UTF-8): El links es un browser para modo texto, similar a lynx
Summary(pl.UTF-8): Eksperymentalny Links (tekstowa przeglądarka WWW)
Summary(pt_BR.UTF-8): O links é um browser para modo texto, similar ao lynx
Name: elinks
Version: 0.12
-Release: 0.%{pre}.2
+Release: 0.%{pre}.1
Epoch: 1
License: GPL
Group: Applications/Networking
Source0: http://www.elinks.cz/download/%{name}-%{version}%{pre}.tar.bz2
-# Source0-md5: bfc2a531f633c9e25e108e5ce2d864ea
+# Source0-md5: 1ea76f04fb5d2e7d6d6a2c82ca310088
Source1: %{name}.desktop
Source2: links.png
Patch0:%{name}-home_etc.patch
Patch1:%{name}-lua40.patch
Patch2:%{name}-date-format.patch
Patch3:%{name}-old_incremental.patch
+Patch4:%{name}-fbterm.patch
URL: http://www.elinks.cz/
BuildRequires: autoconf
BuildRequires: automake
@@ -65,6 +66,7 @@
%{?with_perl:BuildRequires:perl-devel}
%{?with_python:BuildRequires: python-devel}
%{?with_ruby:BuildRequires:ruby-devel}
+BuildRequires: tre-devel
BuildRequires: zlib-devel
Suggests: mailcap
Provides: webclient
@@ -101,6 +103,7 @@
%patch2 -p1
# restores old behaviour of type-ahead search
#%patch3 -p1
+%patch4 -p1
%build
%{__aclocal}
@@ -177,6 +180,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.165 2009/03/29 14:08:52 witekfl
+- up to 0.12pre3
+- BR: tre-devel for wide chars regex search
+- added the fbterm.patch
+
Revision 1.164 2009/03/13 21:49:15 hawk
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/elinks.spec?r1=1.164&r2=1.165&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: elinks-0.12pre3.tar.bz2
Files fetched: 1 STORED: http://www.elinks.cz/download/elinks-0.12pre3.tar.bz2 1ea76f04fb5d2e7d6d6a2c82ca310088 elinks-0.12pre3.tar.bz2 Size: 2711127 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
SPECS: patch.spec - run test suite
Author: arekmDate: Sun Mar 29 14:17:22 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- run test suite
Files affected:
SPECS:
patch.spec (1.64 -> 1.65)
Diffs:
Index: SPECS/patch.spec
diff -u SPECS/patch.spec:1.64 SPECS/patch.spec:1.65
--- SPECS/patch.spec:1.64 Sun Mar 29 15:46:13 2009
+++ SPECS/patch.specSun Mar 29 16:17:16 2009
@@ -1,4 +1,5 @@
# $Revision$, $Date$
+%bcond_without tests
Summary: GNU patch Utilities
Summary(de.UTF-8): GNU-Patch-Utilities
Summary(fr.UTF-8): Utilitaires patch de GNU
@@ -78,6 +79,8 @@
%{__make}
+%{?with_tests:%{__make} check}
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -103,6 +106,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.65 2009/03/29 14:17:16 arekm
+- run test suite
+
Revision 1.64 2009/03/29 13:46:13 arekm
- rel 8; upcoming patch (versioning is broken in new pkg)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/patch.spec?r1=1.64&r2=1.65&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (AC-branch): bind.spec - adapter
Author: glen Date: Sun Mar 29 14:22:48 2009 GMT
Module: SPECS Tag: AC-branch
Log message:
- adapter
Files affected:
SPECS:
bind.spec (1.274.2.5 -> 1.274.2.6)
Diffs:
Index: SPECS/bind.spec
diff -u SPECS/bind.spec:1.274.2.5 SPECS/bind.spec:1.274.2.6
--- SPECS/bind.spec:1.274.2.5 Sun Mar 29 11:33:13 2009
+++ SPECS/bind.spec Sun Mar 29 16:22:43 2009
@@ -11,6 +11,8 @@
%bcond_without tests # perform tests
%bcond_withhip # build with HIP RR support
#
+%definever 9.4.3
+%defineplevel P2
Summary: BIND - DNS name server
Summary(de.UTF-8): BIND - DNS-Namenserver
Summary(es.UTF-8): BIND - Servidor de nombres DNS
@@ -21,8 +23,6 @@
Summary(tr.UTF-8): DNS alan adı sunucusu
Summary(uk.UTF-8): BIND - cервер системи доменних імен (DNS)
Summary(zh_CN.UTF-8): Internet 域名服务器
-%definever 9.4.3
-%defineplevel P2
Name: bind
Version: %{ver}.%{plevel}
Release: 2
@@ -57,14 +57,14 @@
BuildRequires: bison
BuildRequires: flex
BuildRequires: idnkit-devel
-%{?with_hip:BuildRequires: libxml2-devel}
BuildRequires: libtool
+%{?with_hip:BuildRequires: libxml2-devel}
+%{?with_sql:BuildRequires: mysql-devel}
%{?with_ldap:BuildRequires:openldap-devel}
%{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d}
-%{?with_sql:BuildRequires: mysql-devel}
%{?with_sql:BuildRequires: postgresql-devel}
-%{?with_sql:BuildRequires: unixODBC-devel}
BuildRequires: rpmbuild(macros) >= 1.268
+%{?with_sql:BuildRequires: unixODBC-devel}
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
@@ -375,8 +375,7 @@
--enable-getifaddrs=glibc
%{__make}
-%{?with_hip:cd bind-hip/; %{__make}}
-
+%{?with_hip:cd bind-hip; %{__make}}
%{?with_tests:%{__make} test}
%install
@@ -487,8 +486,8 @@
%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/named/root.*
%attr(640,root,named) %config(noreplace) %verify(not md5 mtime size)
%{_var}/lib/named%{_sysconfdir}/*
%attr(660,named,named) %config(noreplace,missingok) %verify(not md5 mtime
size) %{_var}/log/named*
-%attr(660,named,named) %ghost %{_var}/lib/named/named.log
-%attr(660,named,named) %ghost %{_var}/lib/named/named.stats
+%attr(660,named,named) %ghost %{_var}/lib/named/named.log
+%attr(660,named,named) %ghost %{_var}/lib/named/named.stats
%files utils
%defattr(644,root,root,755)
@@ -545,6 +544,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.274.2.6 2009/03/29 14:22:43 glen
+- adapter
+
Revision 1.274.2.5 2009/03/29 09:33:13 marcus
- disable epoll due to errors with Ac kernel 2.4.
- rel.2.
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bind.spec?r1=1.274.2.5&r2=1.274.2.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
SPECS: clamav.spec - release 1 (works for me)
Author: adamgDate: Sun Mar 29 14:23:55 2009 GMT Module: SPECS Tag: HEAD Log message: - release 1 (works for me) Files affected: SPECS: clamav.spec (1.260 -> 1.261) Diffs: Index: SPECS/clamav.spec diff -u SPECS/clamav.spec:1.260 SPECS/clamav.spec:1.261 --- SPECS/clamav.spec:1.260 Fri Mar 27 19:35:51 2009 +++ SPECS/clamav.spec Sun Mar 29 16:23:49 2009 @@ -11,7 +11,7 @@ Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów Name: clamav Version: 0.95 -Release: 0.2 +Release: 1 Epoch: 0 License: GPL v2+ Group: Applications @@ -340,6 +340,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.261 2009/03/29 14:23:49 adamg +- release 1 (works for me) + Revision 1.260 2009/03/27 18:35:51 marcus - use system libltdl CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/clamav.spec?r1=1.260&r2=1.261&f=u ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-commons-digester.spec - build fix for Titanium
Author: pawelz Date: Sun Mar 29 14:25:45 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- build fix for Titanium
Files affected:
SPECS:
java-commons-digester.spec (1.26 -> 1.27)
Diffs:
Index: SPECS/java-commons-digester.spec
diff -u SPECS/java-commons-digester.spec:1.26
SPECS/java-commons-digester.spec:1.27
--- SPECS/java-commons-digester.spec:1.26 Sun Mar 29 03:36:19 2009
+++ SPECS/java-commons-digester.specSun Mar 29 16:25:40 2009
@@ -5,7 +5,7 @@
%bcond_with java_sun# build with java-sun
%if "%{pld_release}" == "ti"
-%definewith_java_sun
+%definewith_java_sun 1
%endif
%include /usr/lib/rpm/macros.java
@@ -122,6 +122,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.27 2009/03/29 14:25:40 pawelz
+- build fix for Titanium
+
Revision 1.26 2009/03/29 01:36:19 pawelz
- typo
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-digester.spec?r1=1.26&r2=1.27&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: linux-2.4.36.tar.bz2 dc395-141.tar.gz cifs-1.20c-2.4.tar.gz patch-2.4.36.9.bz2
Files fetched: 1 ALREADY GOT: ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-2.4.36.tar.bz2 230caed7f3caf23a96ded604ba0ad6ae linux-2.4.36.tar.bz2 ALREADY GOT: http://www.garloff.de/kurt/linux/dc395/dc395-141.tar.gz 8ed492197244b6a772270417c66214d3 dc395-141.tar.gz ALREADY GOT: http://hostopia.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz f3b96692f679239488de30f2bd896825 cifs-1.20c-2.4.tar.gz STORED: ftp://ftp.kernel.org/pub/linux/kernel/v2.4/patch-2.4.36.9.bz2 c0473f3040255e906344030b208ff23e patch-2.4.36.9.bz2 Size: 29478 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
SPECS (AC-branch): kernel24.spec - 2.4.36.9, utf8 spec
Author: glen Date: Sun Mar 29 14:31:57 2009 GMT
Module: SPECS Tag: AC-branch
Log message:
- 2.4.36.9, utf8 spec
Files affected:
SPECS:
kernel24.spec (1.793.2.17 -> 1.793.2.18)
Diffs:
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.793.2.17 SPECS/kernel24.spec:1.793.2.18
--- SPECS/kernel24.spec:1.793.2.17 Tue May 13 09:11:00 2008
+++ SPECS/kernel24.spec Sun Mar 29 16:31:51 2009
@@ -27,15 +27,15 @@
%definedrm_xfree_version 4.3.0
%definebasever 2.4.36
-%definepostver .4
+%definepostver .9
%definerel 0.2
Summary: The Linux kernel (the core of the Linux operating system)
-Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
-Summary(es): N�cleo (Kernel) linux gen�rico
-Summary(fr): Le Kernel-Linux (La partie centrale du systeme)
-Summary(ja): Linux �ͥ� (Linux ���ڥ졼�ƥ��ƥ��ο�¡��ʬ)
-Summary(pl): J�dro Linuksa
-Summary(pt_BR):Kernel Linux (a parte central do sistema operacional
Linux)
+Summary(de.UTF-8): Der Linux-Kernel (Kern des Linux-Betriebssystems)
+Summary(es.UTF-8): Núcleo (Kernel) linux genérico
+Summary(fr.UTF-8): Le Kernel-Linux (La partie centrale du systeme)
+Summary(ja.UTF-8): Linux カーネル (Linux オペレーティングシステムの心臓部分)
+Summary(pl.UTF-8): Jądro Linuksa
+Summary(pt_BR.UTF-8): Kernel Linux (a parte central do sistema operacional
Linux)
Name: kernel24
# %{postver} in EXTRAVERSION causes userspace (glibc? modutils?) to freeze
Version: %{basever}
@@ -53,7 +53,7 @@
# 2.4.26 contains jfs with more recent fixes
#Source7:
http://www10.software.ibm.com/developer/opensource/jfs/project/pub/jfs-2.4-1.1.5.tar.gz
Source10:
ftp://ftp.kernel.org/pub/linux/kernel/v2.4/patch-%{basever}%{postver}.bz2
-# Source10-md5:5fbaff02b7aa91d53f01954b55145f45
+# Source10-md5:c0473f3040255e906344030b208ff23e
Source20: %{name}-ia32.config
Source21: %{name}-ia32-smp.config
Source30: %{name}-amd64.config
@@ -419,49 +419,49 @@
your system. It contains few device drivers for specific hardware.
Most hardware is instead supported by modules loaded after booting.
-%description -l de
-Das Kernel-Paket enth�lt den Linux-Kernel (vmlinuz), den Kern des
-Linux-Betriebssystems. Der Kernel ist f�r grundliegende
+%description -l de.UTF-8
+Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
+Linux-Betriebssystems. Der Kernel ist für grundliegende
Systemfunktionen verantwortlich: Speicherreservierung,
-Proze�-Management, Ger�te Ein- und Ausgaben, usw.
+Prozeß-Management, Geräte Ein- und Ausgaben, usw.
-%description -l es
-Este paquete contiene n�cleo (kernel) Linux que se usa para arranque y
+%description -l es.UTF-8
+Este paquete contiene núcleo (kernel) Linux que se usa para arranque y
funcionamiento de tu sistema. Contiene soporte a pocos hardwares
-espec�ficos. La mayor�a de los hardwares son soportados, v�a m�dulos
-que se cargan despu�s del arranque.
+específicos. La mayoría de los hardwares son soportados, vía módulos
+que se cargan después del arranque.
-%description -l fr
+%description -l fr.UTF-8
Le package kernel contient le kernel linux (vmlinuz), la partie
-centrale d'un syst�me d'exploitation Linux. Le noyau traite les
-fonctions basiques d'un syst�me d'exploitation: allocation m�moire,
-allocation de process, entr�e/sortie de peripheriques, etc.
-
-%description -l ja
-kernel �ѥå��ˤϡ�Red Hat Linux ���ڥ졼�ƥ��ƥ��ο�¡��ʬ
-�Ȥ��� Linux �ͥ� (vmlinuz) ���ޤޤ��Ƥ��ޤ���
-�ͥ��ϡ��ץ��ǥХ��ڥ졼�ƥ�
-�ƥ��δ���Ūʬ���ʤ��ޤ���
-
-%description -l pl
-Pakiet zawiera j�dro Linuksa niezb�dne do prawid�owego dzia�ania
-Twojego komputera. Zawiera w sobie sterowniki do sprz�tu znajduj�cego
-si� w komputerze, takich jak karty muzyczne, sterowniki dysk�w, etc.
-
-%description -l pt_BR
-Este pacote cont�m o kernel Linux que � usado para inicializa��o e
-funcionamento de seu sistema. Cont�m suporte a poucos hardwares
-espec�ficos. A maioria dos hardwares s�o suportados via m�dulos que
-s�o carregados ap�s a inicializa��o.
+centrale d'un système d'exploitation Linux. Le noyau traite les
+fonctions basiques d'un système d'exploitation: allocation mémoire,
+allocation de process, entrée/sortie de peripheriques, etc.
+
+%description -l ja.UTF-8
+kernel パッケージには，Red Hat Linux オペレーティングシステムの心臓部分
+とも言える Linux カーネル (vmlinuz) が含まれています．
+カーネルは，メモリ管理，プロセス管理，デバイスの入出力等，オペレーティング
+システムの基本的な部分を司ります．
+
+%description -l pl.UTF-8
+Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania
+Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego
+się w komputerze, takich jak karty muzyczne, sterowniki dysków, etc.
+
+%description -l pt_BR.UTF-8
+Este pacote contém o kernel Linux que é usado para inicialização e
+funcionamen
SPECS: apache-mod_fcgid.spec - unify (template-apache_module.spec)
Author: glen Date: Sun Mar 29 14:41:54 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- unify (template-apache_module.spec)
Files affected:
SPECS:
apache-mod_fcgid.spec (1.24 -> 1.25)
Diffs:
Index: SPECS/apache-mod_fcgid.spec
diff -u SPECS/apache-mod_fcgid.spec:1.24 SPECS/apache-mod_fcgid.spec:1.25
--- SPECS/apache-mod_fcgid.spec:1.24Sat Mar 28 23:53:38 2009
+++ SPECS/apache-mod_fcgid.spec Sun Mar 29 16:41:49 2009
@@ -20,7 +20,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define_pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define_sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define_sysconfdir %(%{apxs} -q SYSCONFDIR
2>/dev/null)/conf.d
%description
A binary compatibility alternative to Apache module mod_fastcgi.
@@ -45,10 +45,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/70_mod_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/70_mod_%{mod_name}.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -64,7 +64,7 @@
%files
%defattr(644,root,root,755)
%doc AUTHOR ChangeLog
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -73,6 +73,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.25 2009/03/29 14:41:49 glen
+- unify (template-apache_module.spec)
+
Revision 1.24 2009/03/28 22:53:38 areq
- install conf in /etc/httpd/conf.d/
- rel 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache-mod_fcgid.spec?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
SPECS: tg3.spec - resolve file conflict with tg3 from kernel - changelog tr...
Author: marcus Date: Sun Mar 29 14:44:10 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- resolve file conflict with tg3 from kernel
- changelog truncated
Files affected:
SPECS:
tg3.spec (1.2 -> 1.3)
Diffs:
Index: SPECS/tg3.spec
diff -u SPECS/tg3.spec:1.2 SPECS/tg3.spec:1.3
--- SPECS/tg3.spec:1.2 Wed Mar 11 18:14:54 2009
+++ SPECS/tg3.spec Sun Mar 29 16:44:05 2009
@@ -81,7 +81,7 @@
%build
./makeflags.sh /usr/src/linux > tg3_flags.h
-%build_kernel_modules -m tg3
+%build_kernel_modules -m %{pname}
%install
rm -rf $RPM_BUILD_ROOT
@@ -92,7 +92,12 @@
%endif
%if %{with kernel}
-%install_kernel_modules -m tg3 -d kernel/drivers/net
+%install_kernel_modules -m %{pname} -d kernel/drivers/net -n %{pname} -s
current
+# blacklist kernel module
+cat > $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf <<'EOF'
+blacklist tg3
+alias tg3 tg3-current
+EOF
%endif
%clean
@@ -121,13 +126,15 @@
%if %{with up} || %{without dist_kernel}
%files -n kernel%{_alt_kernel}-net-tg3
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/drivers/net/tg3.ko*
+/lib/modules/%{_kernel_ver}/kernel/drivers/net/%{pname}*.ko*
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
%endif
%if %{with smp} && %{with dist_kernel}
%files -n kernel%{_alt_kernel}-smp-net-tg3
%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/tg3.ko*
+/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/%{pname}*.ko*
+/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
%endif
%endif
@@ -137,226 +144,12 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.3 2009/03/29 14:44:05 marcus
+- resolve file conflict with tg3 from kernel
+- changelog truncated
+
Revision 1.2 2009/03/11 17:14:54 qboosh
- killed c/p
Revision 1.1 2009/02/15 15:54:40 marcus
- tg3 3.92n raw spec for 2.6.16
-
-Revision 1.55.2.9.2.1 2008/09/29 20:47:14 glen
-- merge changes from LINUX_2_6_22 branch; rel 6
-
-Revision 1.55.2.9 2008/02/15 15:18:56 glen
-- release 3
-
-Revision 1.55.2.8 2008-02-15 15:18:28 glen
-- fix alt_kernel build, rewrite Makefile so it would build also on alpha
-
-Revision 1.55.2.7 2008-02-15 14:33:13 glen
-- more alt_kernel
-
-Revision 1.55.2.6 2008-02-15 14:32:13 glen
-- alt kernel stuff
-
-Revision 1.55.2.5 2008-02-15 14:28:43 glen
-- use vermagic for kernel deps
-
-Revision 1.55.2.4 2008-02-15 14:26:22 glen
-- merge with HEAD
-
-Revision 1.55.2.3 2008-02-08 18:35:15 qboosh
-- updated comment
-
-Revision 1.55.2.2 2008-02-08 07:58:04 marcus
-- md5 updated
-
-Revision 1.55.2.1 2008-02-08 07:53:32 marcus
-- up to 8.3.14 for Ac
-
-Revision 1.55 2007-03-14 00:13:57 glen
-- up bcond
-
-Revision 1.54 2007/02/12 21:23:49 glen
-- tabs in preamble
-
-Revision 1.53 2007/02/12 00:48:39 baggins
-- converted to UTF-8
-
-Revision 1.52 2006/11/13 14:53:20 sparky
-- don't use %{without ...}, it may not work after inverting bcond
-
-Revision 1.51 2006/04/12 12:15:40 glen
-- add kernel epoch, adapterized
-
-Revision 1.50 2006/02/07 18:01:41 tommat
-- rel 5, STBR
-
-Revision 1.49 2006/02/06 14:01:28 tommat
-- make build with new kernel-module-buid (2.6.14.7-1)
-- rel 4.1, please test and if ok give full release and STBR
-
-Revision 1.48 2006/01/12 20:14:22 arekm
-- rel 4; fix ppc/spac
-
-Revision 1.47 2005/11/13 02:15:15 sparky
-- if there is no asm-powerpc link asm-ppc !
-- spaces->tabs
-
-Revision 1.46 2005/11/12 11:45:21 arekm
-- rel 3
-
-Revision 1.45 2005/11/12 11:34:39 arekm
-- rel 2
-
-Revision 1.44 2005/10/08 16:06:35 areq
-- 8.2.18
-
-Revision 1.43 2005/09/15 18:25:05 sparky
-- prepared for kernel >= 2.6.13: link Module.symvers
-
-Revision 1.42 2005/07/31 12:25:20 pluto
-- extra_cflags killed (kernel buildsystem provides suitable options).
-
-Revision 1.41 2005/07/29 17:08:30 pluto
-- updated to 8.1.55, support debug-build, release 1.
-
-Revision 1.40 2005/05/29 01:29:58 ankry
-- rel 3
-
-Revision 1.39 2005/05/21 22:23:52 averne
-- rel 2
-
-Revision 1.38 2005/01/29 15:27:26 pluto
-- license fixed.
-- BR:, R: fixed.
-
-Revision 1.37 2004/11/05 10:49:22 paladine
-- spaces->tabs
-- cosmetics
-
-Revision 1.36 2004/08/07 23:00:16 havner
-- rel 1
-
-Revision 1.35 2004/08/06 12:13:35 pluto
-- main pkg. without %{_kernel_ver_str}.
-
-Revision 1.34 2004/08/06 12:05:43 pluto
-- md5.
-
-Revision 1.33 2004/08/06 12:03:54 pluto
-- updated to 7.3.5.
-- waiting for spec rename...
-- release 0.1.
-
-Revision 1.32 2004/06/19 16:07:01 qboosh
-- tg3 is preferred on 2.4.x too (tg3 had some SMP problems)
-
-Revision 1.31 2004/06/16 14:06:20 jpc
-- BR + note in the header - this is for 2.4 only
-
-Revision 1.30 2003/08/12 22:32:48 ankry
-- cosmetics
-
-Revision 1.29 2003/07/10 13:23:34 trojan
-- added using depmod macro
-
-Revision 1.28 2003/05/28 12:59:19 malekith
-- massive attack: source-md5
-
-Revision 1
SPECS: scgi.spec - unify (template-apache_module.spec)
Author: glen Date: Sun Mar 29 14:44:50 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- unify (template-apache_module.spec)
Files affected:
SPECS:
scgi.spec (1.17 -> 1.18)
Diffs:
Index: SPECS/scgi.spec
diff -u SPECS/scgi.spec:1.17 SPECS/scgi.spec:1.18
--- SPECS/scgi.spec:1.17Sat Mar 28 23:50:33 2009
+++ SPECS/scgi.spec Sun Mar 29 16:44:45 2009
@@ -30,6 +30,9 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define_pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define_sysconfdir %(%{apxs} -q SYSCONFDIR
2>/dev/null)/conf.d
+
%description
The SCGI protocol is a replacement for the Common Gateway Interface
(CGI) protocol. It is a standard for applications to interface with
@@ -105,11 +108,9 @@
%install
rm -rf $RPM_BUILD_ROOT
%if %{with apache}
-install -d $RPM_BUILD_ROOT%{_libdir}/apache
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-
-install apache2/.libs/mod_scgi.so $RPM_BUILD_ROOT%{_libdir}/apache
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/60_mod_scgi.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
+install apache2/.libs/mod_scgi.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/60_mod_scgi.conf
%endif
%{__python} setup.py install \
@@ -133,8 +134,8 @@
%files -n apache-mod_scgi
%defattr(644,root,root,755)
%doc CHANGES.txt apache2/README.txt LICENSE.txt doc/LICENSE_110.txt
-%attr(755,root,root) %{_libdir}/apache/mod_%{name}.so
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/httpd/conf.d/*.conf
+%attr(755,root,root) %{_pkglibdir}/mod_%{name}.so
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/*.conf
%endif
%files -n python-%{name}
@@ -151,6 +152,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.18 2009/03/29 14:44:45 glen
+- unify (template-apache_module.spec)
+
Revision 1.17 2009/03/28 22:50:33 areq
- install conf in /etc/httpd/conf.d/
- rel 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scgi.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
SPECS: tg3.spec - %%files fixed
Author: marcus Date: Sun Mar 29 14:46:54 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- %%files fixed
Files affected:
SPECS:
tg3.spec (1.3 -> 1.4)
Diffs:
Index: SPECS/tg3.spec
diff -u SPECS/tg3.spec:1.3 SPECS/tg3.spec:1.4
--- SPECS/tg3.spec:1.3 Sun Mar 29 16:44:05 2009
+++ SPECS/tg3.spec Sun Mar 29 16:46:49 2009
@@ -134,7 +134,7 @@
%files -n kernel%{_alt_kernel}-smp-net-tg3
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/%{pname}*.ko*
-/etc/modprobe.d/%{_kernel_ver}/%{pname}.conf
+/etc/modprobe.d/%{_kernel_ver}smp/%{pname}.conf
%endif
%endif
@@ -144,6 +144,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.4 2009/03/29 14:46:49 marcus
+- %%files fixed
+
Revision 1.3 2009/03/29 14:44:05 marcus
- resolve file conflict with tg3 from kernel
- changelog truncated
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/tg3.spec?r1=1.3&r2=1.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: clamav.spec - lib64 safe; rel 2
Author: glen Date: Sun Mar 29 14:52:53 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- lib64 safe; rel 2
Files affected:
SPECS:
clamav.spec (1.261 -> 1.262)
Diffs:
Index: SPECS/clamav.spec
diff -u SPECS/clamav.spec:1.261 SPECS/clamav.spec:1.262
--- SPECS/clamav.spec:1.261 Sun Mar 29 16:23:49 2009
+++ SPECS/clamav.spec Sun Mar 29 16:52:47 2009
@@ -1,7 +1,6 @@
# $Revision$, $Date$
# TODO:
# - Make freshclam package (script and daemon)
-# - user system libltdl
# - restart amavis in triggers if group membership was modified?
#
# Conditional build:
@@ -11,7 +10,7 @@
Summary(pl.UTF-8): Narzędzie antywirusowe dla Uniksów
Name: clamav
Version: 0.95
-Release: 1
+Release: 2
Epoch: 0
License: GPL v2+
Group: Applications
@@ -158,9 +157,11 @@
%{?with_milter:--enable-milter} \
--with-dbdir=/var/lib/%{name} \
--with-no-cache \
- --with-ltdl-include=/usr/include/ \
- --with-ltdl-lib=/usr/lib/
-%{__make} LIBTOOL=/usr/bin/libtool
+ --with-ltdl-include=/usr/include \
+ --with-ltdl-lib=%{_libdir}
+
+%{__make} \
+ LIBTOOL=/usr/bin/libtool
%install
rm -rf $RPM_BUILD_ROOT
@@ -340,6 +341,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.262 2009/03/29 14:52:47 glen
+- lib64 safe; rel 2
+
Revision 1.261 2009/03/29 14:23:49 adamg
- release 1 (works for me)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/clamav.spec?r1=1.261&r2=1.262&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: iptables.init, ip6tables.init - revert
Author: glen Date: Sun Mar 29 14:57:11 2009 GMT Module: SOURCES Tag: HEAD Log message: - revert Files affected: SOURCES: iptables.init (1.9 -> 1.10) , ip6tables.init (1.13 -> 1.14) Diffs: Index: SOURCES/iptables.init diff -u SOURCES/iptables.init:1.9 SOURCES/iptables.init:1.10 --- SOURCES/iptables.init:1.9 Fri Mar 27 16:11:38 2009 +++ SOURCES/iptables.init Sun Mar 29 16:57:05 2009 @@ -26,11 +26,6 @@ # Source 'em up . /etc/rc.d/init.d/functions -# Not supported in vserver -if is_yes "$VSERVER"; then - exit 0 -fi - if [ "$(kernelver)" -lt "002003000" ]; then exit 0 fi Index: SOURCES/ip6tables.init diff -u SOURCES/ip6tables.init:1.13 SOURCES/ip6tables.init:1.14 --- SOURCES/ip6tables.init:1.13 Fri Mar 27 16:11:39 2009 +++ SOURCES/ip6tables.init Sun Mar 29 16:57:06 2009 @@ -27,11 +27,6 @@ # Source 'em up . /etc/rc.d/init.d/functions -# Not supported in vserver -if is_yes "$VSERVER"; then - exit 0 -fi - if [ "$(kernelver)" -lt "002003000" ]; then exit 0 fi CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables.init?r1=1.9&r2=1.10&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ip6tables.init?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
SPECS: java-log4j.spec - proper bcond for Titanium; rel 8
Author: paszczus Date: Sun Mar 29 15:12:12 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- proper bcond for Titanium; rel 8
Files affected:
SPECS:
java-log4j.spec (1.54 -> 1.55)
Diffs:
Index: SPECS/java-log4j.spec
diff -u SPECS/java-log4j.spec:1.54 SPECS/java-log4j.spec:1.55
--- SPECS/java-log4j.spec:1.54 Sat Mar 28 23:19:08 2009
+++ SPECS/java-log4j.spec Sun Mar 29 17:12:06 2009
@@ -7,19 +7,18 @@
# - jmx,jndi by java-sun-jre
#
# Conditional build:
-%bcond_without dist# build components which can't be distributed
-%bcond_withjms # JMS interface (org.apache.log4j.or.jms)
-%bcond_withjmx # JMX interface (org.apache.log4j.jmx)
-%bcond_withtests # tun tests
+%bcond_without dist# build components which can't be distributed
+%bcond_withjava_sun# build with java-sun
+%bcond_withjms # JMS interface (org.apache.log4j.or.jms)
+%bcond_withjmx # JMX interface (org.apache.log4j.jmx)
+%bcond_withtests # tun tests
#
%if %{without dist}
%definewith_jms1
%definewith_jmx1
%endif
%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
-%bcond_withjava_sun# build with java-sun
+%definewith_java_sun 1
%endif
#
%definesrcname log4j
@@ -29,7 +28,7 @@
Summary(pl.UTF-8): log4j - zapis logów dla Javy
Name: java-%{srcname}
Version: 1.2.15
-Release: 7
+Release: 8
License: Apache v2.0
Group: Development/Languages/Java
Source0:
http://www.apache.org/dist/logging/log4j/%{version}/apache-%{srcname}-%{version}.tar.gz
@@ -148,6 +147,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.55 2009/03/29 15:12:06 paszczus
+- proper bcond for Titanium; rel 8
+
Revision 1.54 2009/03/28 22:19:08 pawelz
- more P/O after changing Name
- rel 7
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-log4j.spec?r1=1.54&r2=1.55&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: duplicity-0.5.13.tar.gz
Files fetched: 1 STORED: http://savannah.nongnu.org/download/duplicity/duplicity-0.5.13.tar.gz c87278302d297a4ce9681aedb0ef8b52 duplicity-0.5.13.tar.gz Size: 211639 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
SPECS: duplicity.spec - up to 0.5.13
Author: duddits Date: Sun Mar 29 15:19:37 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- up to 0.5.13
Files affected:
SPECS:
duplicity.spec (1.22 -> 1.23)
Diffs:
Index: SPECS/duplicity.spec
diff -u SPECS/duplicity.spec:1.22 SPECS/duplicity.spec:1.23
--- SPECS/duplicity.spec:1.22 Fri Mar 13 22:45:40 2009
+++ SPECS/duplicity.specSun Mar 29 17:19:32 2009
@@ -2,12 +2,12 @@
Summary: Untrusted/encrypted backup using rsync algorithm
Summary(pl.UTF-8): Wykonywanie szyfrowanych kopii zapasowych przy użyciu
algorytmu rsync
Name: duplicity
-Version: 0.5.09
-Release: 2
+Version: 0.5.13
+Release: 1
License: GPL
Group: Applications/Archiving
Source0:
http://savannah.nongnu.org/download/duplicity/%{name}-%{version}.tar.gz
-# Source0-md5: b48c390825fba8ddc15bef4400f8e4f1
+# Source0-md5: c87278302d297a4ce9681aedb0ef8b52
URL: http://www.nongnu.org/duplicity/
BuildRequires: librsync-devel >= 0.9.6
BuildRequires: python-devel >= 2.2.1
@@ -81,6 +81,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.23 2009/03/29 15:19:32 duddits
+- up to 0.5.13
+
Revision 1.22 2009/03/13 21:45:40 hawk
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/duplicity.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
SPECS: java-ical4j.spec - proper bcond for Titanium; rel 2
Author: paszczus Date: Sun Mar 29 15:25:10 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- proper bcond for Titanium; rel 2
Files affected:
SPECS:
java-ical4j.spec (1.4 -> 1.5)
Diffs:
Index: SPECS/java-ical4j.spec
diff -u SPECS/java-ical4j.spec:1.4 SPECS/java-ical4j.spec:1.5
--- SPECS/java-ical4j.spec:1.4 Thu Mar 26 23:50:04 2009
+++ SPECS/java-ical4j.spec Sun Mar 29 17:25:05 2009
@@ -1,9 +1,7 @@
# $Revision$, $Date$
%bcond_without javadoc # don't build javadoc
%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
-%bcond_withjava_sun# build with java-sun
+%definewith_java_sun 1
%endif
#
%include /usr/lib/rpm/macros.java
@@ -15,7 +13,7 @@
Summary(pl.UTF-8): Java API dodające wsparcie dla iCalendar
Name: java-%{srcname}
Version: 1.0
-Release: 0.%{_rc}.1
+Release: 0.%{_rc}.2
License: BSD-like
Group: Libraries/Java
Source0:
http://dl.sourceforge.net/ical4j/%{srcname}-%{version}-%{_rc}-src.tar.bz2
@@ -108,6 +106,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.5 2009/03/29 15:25:05 paszczus
+- proper bcond for Titanium; rel 2
+
Revision 1.4 2009/03/26 22:50:04 pawelz
- License info
- fixed last commit log
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-ical4j.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
SPECS: java-ical4j.spec - proper Group
Author: paszczus Date: Sun Mar 29 15:27:21 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- proper Group
Files affected:
SPECS:
java-ical4j.spec (1.5 -> 1.6)
Diffs:
Index: SPECS/java-ical4j.spec
diff -u SPECS/java-ical4j.spec:1.5 SPECS/java-ical4j.spec:1.6
--- SPECS/java-ical4j.spec:1.5 Sun Mar 29 17:25:05 2009
+++ SPECS/java-ical4j.spec Sun Mar 29 17:27:15 2009
@@ -15,7 +15,7 @@
Version: 1.0
Release: 0.%{_rc}.2
License: BSD-like
-Group: Libraries/Java
+Group: Development/Languages/Java
Source0:
http://dl.sourceforge.net/ical4j/%{srcname}-%{version}-%{_rc}-src.tar.bz2
# Source0-md5: 1d07fbdf05cfad34354603b25d2ef8ea
URL: http://ical4j.sourceforge.net/
@@ -106,6 +106,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.6 2009/03/29 15:27:15 paszczus
+- proper Group
+
Revision 1.5 2009/03/29 15:25:05 paszczus
- proper bcond for Titanium; rel 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-ical4j.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
SVN: java-tools/list-sysjars.sh
Author: pawelz
Date: Sun Mar 29 17:28:22 2009
New Revision: 10268
Modified:
java-tools/list-sysjars.sh
Log:
- translate directories to package names (tr / .)
Modified: java-tools/list-sysjars.sh
==
--- java-tools/list-sysjars.sh (original)
+++ java-tools/list-sysjars.sh Sun Mar 29 17:28:22 2009
@@ -13,5 +13,5 @@
fi
for I in /usr/share/java/*.jar; do
- [ -L $I ] || jar tf $I | grep -v '\$' | awk '{gsub ("\.class$", "");
printf("%s %s\n", "'$I'", $0)}';
+ [ -L $I ] || jar tf $I | tr '/' '.' | grep -v '\$' | awk '{gsub ("\.class$",
""); printf("%s %s\n", "'$I'", $0)}';
done
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-ical4j.spec - too fast. added bcond java_sun; rel 3
Author: paszczus Date: Sun Mar 29 15:30:29 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- too fast. added bcond java_sun; rel 3
Files affected:
SPECS:
java-ical4j.spec (1.6 -> 1.7)
Diffs:
Index: SPECS/java-ical4j.spec
diff -u SPECS/java-ical4j.spec:1.6 SPECS/java-ical4j.spec:1.7
--- SPECS/java-ical4j.spec:1.6 Sun Mar 29 17:27:15 2009
+++ SPECS/java-ical4j.spec Sun Mar 29 17:30:24 2009
@@ -1,5 +1,7 @@
# $Revision$, $Date$
%bcond_without javadoc # don't build javadoc
+%bcond_withjava_sun# build with java-sun
+#
%if "%{pld_release}" == "ti"
%definewith_java_sun 1
%endif
@@ -13,7 +15,7 @@
Summary(pl.UTF-8): Java API dodające wsparcie dla iCalendar
Name: java-%{srcname}
Version: 1.0
-Release: 0.%{_rc}.2
+Release: 0.%{_rc}.3
License: BSD-like
Group: Development/Languages/Java
Source0:
http://dl.sourceforge.net/ical4j/%{srcname}-%{version}-%{_rc}-src.tar.bz2
@@ -106,6 +108,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.7 2009/03/29 15:30:24 paszczus
+- too fast. added bcond java_sun; rel 3
+
Revision 1.6 2009/03/29 15:27:15 paszczus
- proper Group
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-ical4j.spec?r1=1.6&r2=1.7&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-jaxen.spec - proper bcond for Titanium - proper Group
Author: paszczus Date: Sun Mar 29 15:31:40 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- proper bcond for Titanium
- proper Group
Files affected:
SPECS:
java-jaxen.spec (1.4 -> 1.5)
Diffs:
Index: SPECS/java-jaxen.spec
diff -u SPECS/java-jaxen.spec:1.4 SPECS/java-jaxen.spec:1.5
--- SPECS/java-jaxen.spec:1.4 Fri Mar 27 17:06:13 2009
+++ SPECS/java-jaxen.spec Sun Mar 29 17:31:34 2009
@@ -5,10 +5,10 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_without tests # don't build and run tests
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
%bcond_withjava_sun# build with java-sun
+#
+%if "%{pld_release}" == "ti"
+%definewith_java_sun 1
%endif
#
%include /usr/lib/rpm/macros.java
@@ -19,7 +19,7 @@
Version: 1.1.1
Release: 0.1
License: BSD-like
-Group: Libraries/Java
+Group: Development/Languages/Java
Source0:
http://dist.codehaus.org/jaxen/distributions/jaxen-%{version}-src.tar.gz
# Source0-md5: b598ae6b7e765a92e13667b0a80392f4
URL: http://jaxen.codehaus.org/
@@ -123,6 +123,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.5 2009/03/29 15:31:34 paszczus
+- proper bcond for Titanium
+- proper Group
+
Revision 1.4 2009/03/27 16:06:13 pawelz
- s/%{name}/%{srcname}/
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-jaxen.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
SPECS (DEVEL): java-commons-logging.spec - jdk bconds - dropped EA - Proper...
Author: pawelz Date: Sun Mar 29 15:43:48 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- jdk bconds
- dropped EA
- Proper P/O after changing Name
- small fixes, unified
Files affected:
SPECS:
java-commons-logging.spec (1.21.2.3 -> 1.21.2.4)
Diffs:
Index: SPECS/java-commons-logging.spec
diff -u SPECS/java-commons-logging.spec:1.21.2.3
SPECS/java-commons-logging.spec:1.21.2.4
--- SPECS/java-commons-logging.spec:1.21.2.3Fri Jan 23 12:19:54 2009
+++ SPECS/java-commons-logging.spec Sun Mar 29 17:43:43 2009
@@ -1,4 +1,12 @@
# $Revision$, $Date$
+%bcond_withjava_sun# build with java-sun
+
+%if "%{pld_release}" == "ti"
+%definewith_java_sun 1
+%endif
+
+%definesrcname commons-logging
+
%include /usr/lib/rpm/macros.java
Summary: Commons Logging - interface for logging systems
Summary(pl.UTF-8): Commons Logging - interfejs do systemów logujących
@@ -16,15 +24,17 @@
BuildRequires: avalon-framework
BuildRequires: avalon-logkit
BuildRequires: jakarta-servletapi >= 4
-BuildRequires: jdk >= 1.4
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:java-sun}
BuildRequires: jpackage-utils
BuildRequires: junit
BuildRequires: logging-log4j
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: jre >= 1.4
+Obsoletes: jakarta-commons-logging
+Provides: jakarta-commons-logging
BuildArch: noarch
-ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -43,11 +53,12 @@
na używanie pakietu samodzielnie.
%package javadoc
-Summary: Jakarta Commons Logging documentation
-Summary(pl.UTF-8): Dokumentacja do Jakarta Commons Logging
+Summary: Commons Logging documentation
+Summary(pl.UTF-8): Dokumentacja do Commons Logging
Group: Documentation
Requires: jpackage-utils
Obsoletes: jakarta-commons-logging-doc
+Obsoletes: jakarta-commons-logging-javadoc
%description javadoc
Commons Logging documentation.
@@ -66,21 +77,21 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}}
-install dist/commons-logging-api.jar
$RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}-api.jar
-install dist/commons-logging.jar
$RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar
-ln -s commons-logging-%{version}-api.jar
$RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar
-ln -s commons-logging-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/commons-logging.jar
+install dist/%{srcname}-api.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}-api.jar
+install dist/%{srcname}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}-api.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-api.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
-cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost
symlink
%clean
rm -rf $RPM_BUILD_ROOT
%post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
%files
%defattr(644,root,root,755)
@@ -89,8 +100,8 @@
%files javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
%definedate%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -98,6 +109,12 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.21.2.4 2009/03/29 15:43:43 pawelz
+- jdk bconds
+- dropped EA
+- Proper P/O after changing Name
+- small fixes, unified
+
Revision 1.21.2.3 2009/01/23 11:19:54 pawelz
- BR: junit, avalon-{framework,logkit}
- unified License
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-logging.spec?r1=1.21.2.3&r2=1.21.2.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-commons-io.spec - unified jdk bconds - dropped "export SHELL=/b...
Author: pawelz Date: Sun Mar 29 15:48:28 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- unified jdk bconds
- dropped "export SHELL=/bin/sh" (no longer needed, fixed in gjdoc.spec)
Files affected:
SPECS:
java-commons-io.spec (1.14 -> 1.15)
Diffs:
Index: SPECS/java-commons-io.spec
diff -u SPECS/java-commons-io.spec:1.14 SPECS/java-commons-io.spec:1.15
--- SPECS/java-commons-io.spec:1.14 Tue Feb 10 14:03:50 2009
+++ SPECS/java-commons-io.spec Sun Mar 29 17:48:23 2009
@@ -3,6 +3,11 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_withtests # run tests (takes long time)
+%bcond_withjava_sun# build with java-sun
+
+%if "%{pld_release}" == "ti"
+%definewith_java_sun 1
+%endif
%include /usr/lib/rpm/macros.java
@@ -19,7 +24,8 @@
URL: http://commons.apache.org/io/
BuildRequires: ant
%{?with_tests:BuildRequires: ant-junit >= 1.5}
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:java-sun}
BuildRequires: jpackage-utils
%{?with_tests:BuildRequires: junit >= 3.8.1}
BuildRequires: rpm-javaprov
@@ -60,8 +66,7 @@
%build
# for tests
-export SHELL=/bin/sh
-%ant -Dbuild.compiler=extJavac jar %{?with_javadoc:javadoc}
+%ant jar %{?with_javadoc:javadoc}
%if %{with tests}
JUNITJAR=$(find-jar junit)
@@ -105,6 +110,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.15 2009/03/29 15:48:23 pawelz
+- unified jdk bconds
+- dropped "export SHELL=/bin/sh" (no longer needed, fixed in gjdoc.spec)
+
Revision 1.14 2009/02/10 13:03:50 pawelz
- use %%srcname macro
- correct dir for javadoc
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-io.spec?r1=1.14&r2=1.15&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-commons-lang.spec - jdk bconds - proper P/O after changing Name...
Author: pawelz Date: Sun Mar 29 15:55:18 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- jdk bconds
- proper P/O after changing Name
- include java rpm macros
- simplified %%build:
- dropped "export SHELL=/bin/sh" (fixed gjdoc)
- dropped "-Dbuil.compiler=extJavac" (fixed java-gcj-compat-devel)
Files affected:
SPECS:
java-commons-lang.spec (1.15 -> 1.16)
Diffs:
Index: SPECS/java-commons-lang.spec
diff -u SPECS/java-commons-lang.spec:1.15 SPECS/java-commons-lang.spec:1.16
--- SPECS/java-commons-lang.spec:1.15 Wed Feb 18 16:50:00 2009
+++ SPECS/java-commons-lang.specSun Mar 29 17:55:13 2009
@@ -2,7 +2,14 @@
#
# Conditional build:
%bcond_without javadoc # don't build apidocs
-#
+%bcond_withjava_sun# build with java-sun
+
+%if "%{pld_release}" == "ti"
+%definewith_java_sun 1
+%endif
+
+%include /usr/lib/rpm/macros.java
+
%definesrcname commons-lang
Summary: Commons Lang - utility functions and components
Summary(pl.UTF-8): Commons Lang - funkcje i komponenty narzędziowe
@@ -15,11 +22,13 @@
# Source0-md5: d8379e93f597b2ae6d1f7b4bb7e83fce
URL: http://commons.apache.org/lang/
BuildRequires: ant >= 1.5
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:java-sun}
BuildRequires: jaxp_parser_impl
BuildRequires: jpackage-utils
BuildRequires: rpmbuild(macros) >= 1.294
Obsoletes: jakarta-commons-lang
+Provides: jakarta-commons-lang
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +45,7 @@
Summary(pl.UTF-8): Dokumentacja online do Commons Lang
Group: Documentation
Requires: jpackage-utils
+Obsoletes: jakarta-commons-lang-javadoc
%description javadoc
Documentation for Commons Lang.
@@ -50,12 +60,7 @@
%setup -q -n commons-lang-%{version}
%build
-%ant -Dbuild.compiler=extJavac jar
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
+%ant jar %{?with_javadoc:javadoc}
%install
rm -rf $RPM_BUILD_ROOT
@@ -95,6 +100,14 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.16 2009/03/29 15:55:13 pawelz
+- jdk bconds
+- proper P/O after changing Name
+- include java rpm macros
+- simplified %%build:
+- dropped "export SHELL=/bin/sh" (fixed gjdoc)
+- dropped "-Dbuil.compiler=extJavac" (fixed java-gcj-compat-devel)
+
Revision 1.15 2009/02/18 15:50:00 qboosh
- unified
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-lang.spec?r1=1.15&r2=1.16&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: java-commons-lang.spec - it uses Apache License v 2.0 not 1.1 - rel 4
Author: pawelz Date: Sun Mar 29 15:57:44 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- it uses Apache License v 2.0 not 1.1
- rel 4
Files affected:
SPECS:
java-commons-lang.spec (1.16 -> 1.17)
Diffs:
Index: SPECS/java-commons-lang.spec
diff -u SPECS/java-commons-lang.spec:1.16 SPECS/java-commons-lang.spec:1.17
--- SPECS/java-commons-lang.spec:1.16 Sun Mar 29 17:55:13 2009
+++ SPECS/java-commons-lang.specSun Mar 29 17:57:39 2009
@@ -15,8 +15,8 @@
Summary(pl.UTF-8): Commons Lang - funkcje i komponenty narzędziowe
Name: java-commons-lang
Version: 2.1
-Release: 3
-License: Apache v1.1
+Release: 4
+License: Apache v2.0
Group: Libraries/Java
Source0:
http://www.apache.org/dist/commons/lang/source/commons-lang-%{version}-src.tar.gz
# Source0-md5: d8379e93f597b2ae6d1f7b4bb7e83fce
@@ -100,6 +100,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.17 2009/03/29 15:57:39 pawelz
+- it uses Apache License v 2.0 not 1.1
+- rel 4
+
Revision 1.16 2009/03/29 15:55:13 pawelz
- jdk bconds
- proper P/O after changing Name
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-lang.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
SPECS: gdm.spec - updated to 2.20.10
Author: megabajt Date: Sun Mar 29 16:07:01 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 2.20.10
Files affected:
SPECS:
gdm.spec (1.236 -> 1.237)
Diffs:
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.236 SPECS/gdm.spec:1.237
--- SPECS/gdm.spec:1.236Sat Dec 27 12:44:53 2008
+++ SPECS/gdm.spec Sun Mar 29 18:06:55 2009
@@ -15,13 +15,13 @@
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
-Version: 2.20.9
+Version: 2.20.10
Release: 1
Epoch: 2
License: GPL/LGPL
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: bdc7265f77b2e26e90d48ac512136e54
+# Source0-md5: 981c7ee7fbe453061e095ab52a3513f8
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
@@ -306,6 +306,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.237 2009/03/29 16:06:55 megabajt
+- updated to 2.20.10
+
Revision 1.236 2008/12/27 11:44:53 adamg
- updated to 2.20.9
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdm.spec?r1=1.236&r2=1.237&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: gdm-2.20.10.tar.bz2 gdm-storky.tar.gz
Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-2.20.10.tar.bz2 981c7ee7fbe453061e095ab52a3513f8 gdm-2.20.10.tar.bz2 Size: 3940077 bytes ALREADY GOT: no-url://gdm-storky.tar.gz e293fbe4a60004056f6894463b874ae8 gdm-storky.tar.gz -- 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
SPECS: php-symfony.spec - R: php-ctype
Author: mmazur Date: Sun Mar 29 16:11:09 2009 GMT Module: SPECS Tag: HEAD Log message: - R: php-ctype Files affected: SPECS: php-symfony.spec (1.18 -> 1.19) Diffs: Index: SPECS/php-symfony.spec diff -u SPECS/php-symfony.spec:1.18 SPECS/php-symfony.spec:1.19 --- SPECS/php-symfony.spec:1.18 Thu Mar 26 16:10:49 2009 +++ SPECS/php-symfony.spec Sun Mar 29 18:11:04 2009 @@ -16,6 +16,7 @@ BuildRequires: rpmbuild(macros) >= 1.461 Requires: Smarty Requires: php-common +Requires: php-ctype Requires: php-pear-Archive_Tar Requires: php-pear-Log Requires: php-pear-PEAR @@ -92,6 +93,9 @@ All persons listed below can be reached at @pld-linux.org $Log$ +Revision 1.19 2009/03/29 16:11:04 mmazur +- R: php-ctype + Revision 1.18 2009/03/26 15:10:49 mmazur - up to 1.2.4; rel 1; stbr th CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php-symfony.spec?r1=1.18&r2=1.19&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: PasteScript-1.7.3.tar.gz
Files fetched: 1 STORED: http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-1.7.3.tar.gz 9101a3a23809d3413b39ba8b75dd0bce PasteScript-1.7.3.tar.gz Size: 127667 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
SPECS: python-PasteScript.spec - Up to 1.7.3
Author: beornDate: Sun Mar 29 16:14:58 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- Up to 1.7.3
Files affected:
SPECS:
python-PasteScript.spec (1.13 -> 1.14)
Diffs:
Index: SPECS/python-PasteScript.spec
diff -u SPECS/python-PasteScript.spec:1.13 SPECS/python-PasteScript.spec:1.14
--- SPECS/python-PasteScript.spec:1.13 Fri Feb 6 00:16:01 2009
+++ SPECS/python-PasteScript.spec Sun Mar 29 18:14:53 2009
@@ -2,12 +2,12 @@
Summary: A pluggable command-line tool
Summary(pl.UTF-8): Narzędzie linii poleceń z obsługą wtyczek
Name: python-PasteScript
-Version: 1.3.6
+Version: 1.7.3
Release: 0.1
Group: Libraries/Python
License: X11/MIT
Source0:
http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
-# Source0-md5: 6a79da14870f0bbe9c1f7d4d12912437
+# Source0-md5: 9101a3a23809d3413b39ba8b75dd0bce
URL: http://pythonpaste.org/script/
BuildRequires: python-devel
BuildRequires: python-setuptools >= 0.6-0.a9.1
@@ -71,6 +71,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.14 2009/03/29 16:14:53 beorn
+- Up to 1.7.3
+
Revision 1.13 2009/02/05 23:16:01 beorn
- Group name fix
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-PasteScript.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
SPECS: java-lucene.spec - proper bcond for Titanium - package contrib files...
Author: paszczus Date: Sun Mar 29 16:21:53 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- proper bcond for Titanium
- package contrib files to -contrib subpackage
- rel 5
Files affected:
SPECS:
java-lucene.spec (1.7 -> 1.8)
Diffs:
Index: SPECS/java-lucene.spec
diff -u SPECS/java-lucene.spec:1.7 SPECS/java-lucene.spec:1.8
--- SPECS/java-lucene.spec:1.7 Sun Mar 29 10:15:49 2009
+++ SPECS/java-lucene.spec Sun Mar 29 18:21:48 2009
@@ -11,20 +11,20 @@
# at gnu.classpath.tools.gjdoc.Main.main(Main.java:883)
%bcond_without javadoc # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
%bcond_withjava_sun# build with java-sun
+%if "%{pld_release}" == "ti"
+%definewith_java_sun 1
%endif
#
%include /usr/lib/rpm/macros.java
#
%definesrcname lucene
+%definecontrib_ver 2.4
Summary: Text search engine library in Java
Name: java-%{srcname}
Version: 2.4.1
-Release: 4
+Release: 5
License: Apache v2.0
Group: Development/Languages/Java
Source0:
http://www.apache.net.pl/lucene/java/lucene-%{version}-src.tar.gz
@@ -47,6 +47,14 @@
nearly any application that requires full-text search, especially
cross-platform.
+%package contrib
+Summary: Contrib packages for lucene
+Group: Development/Languages/Java
+Requires: %{name}
+
+%description contrib
+Contrib packages for lucene.
+
%package javadoc
Summary: Online manual for lucene
Summary(pl.UTF-8): Dokumentacja online do lucene
@@ -100,6 +108,18 @@
cp -a %{srcname}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
+# Contrib packages
+CONTRIB_PACKAGES="analyzers benchmark highlighter instantiated lucli memory
misc queries regex similarity snowball spellchecker surround swing wikipedia
wordnet xml-query-parser"
+for i in $CONTRIB_PACKAGES
+do
+cp -a build/contrib/$i/%{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i-%{contrib_ver}.jar
+ln -s %{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i.jar
+done
+cp -a build/contrib/db/bdb/%{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
+ln -s %{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb.jar
+cp -a build/contrib/db/bdb-je/%{srcname}-bdb-je-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je-%{contrib_ver}.jar
+ln -s %{srcname}-bdb-je-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-je.jar
+
# javadoc
%if %{with javadoc}
install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
@@ -125,12 +145,58 @@
%ghost %{_javadocdir}/%{srcname}
%endif
+%files contrib
+%defattr(644,root,root,755)
+%{_javadir}/%{srcname}-analyzers-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-analyzers.jar
+%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-bdb-je-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-bdb-je.jar
+%{_javadir}/%{srcname}-bdb.jar
+%{_javadir}/%{srcname}-benchmark-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-benchmark.jar
+%{_javadir}/%{srcname}-highlighter-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-highlighter.jar
+%{_javadir}/%{srcname}-instantiated-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-instantiated.jar
+%{_javadir}/%{srcname}-lucli-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-lucli.jar
+%{_javadir}/%{srcname}-memory-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-memory.jar
+%{_javadir}/%{srcname}-misc-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-misc.jar
+%{_javadir}/%{srcname}-queries-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-queries.jar
+%{_javadir}/%{srcname}-regex-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-regex.jar
+%{_javadir}/%{srcname}-similarity-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-similarity.jar
+%{_javadir}/%{srcname}-snowball-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-snowball.jar
+%{_javadir}/%{srcname}-spellchecker-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-spellchecker.jar
+%{_javadir}/%{srcname}-surround-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-surround.jar
+%{_javadir}/%{srcname}-swing-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-swing.jar
+%{_javadir}/%{srcname}-wikipedia-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-wikipedia.jar
+%{_javadir}/%{srcname}-wordnet-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-wordnet.jar
+%{_javadir}/%{srcname}-xml-query-parser-%{contrib_ver}.jar
+%{_javadir}/%{srcname}-xml-query-parser.jar
+
%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.8 2009/03/29 16:21:48 paszczus
+- proper bcond for Titanium
+- package contrib files to -contrib subpackage
+- rel 5
+
SPECS: java-lucene.spec - BR: ant
Author: pawelz Date: Sun Mar 29 16:33:32 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- BR: ant
Files affected:
SPECS:
java-lucene.spec (1.8 -> 1.9)
Diffs:
Index: SPECS/java-lucene.spec
diff -u SPECS/java-lucene.spec:1.8 SPECS/java-lucene.spec:1.9
--- SPECS/java-lucene.spec:1.8 Sun Mar 29 18:21:48 2009
+++ SPECS/java-lucene.spec Sun Mar 29 18:33:26 2009
@@ -31,6 +31,7 @@
# Source0-md5: ad46595439240e10387fcbf7647705db
Patch0:%{name}-test.patch
URL: http://lucene.apache.org/
+BuildRequires: ant
BuildRequires: java-commons-digester
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
%{?with_java_sun:BuildRequires:java-sun}
@@ -192,6 +193,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.9 2009/03/29 16:33:26 pawelz
+- BR: ant
+
Revision 1.8 2009/03/29 16:21:48 paszczus
- proper bcond for Titanium
- package contrib files to -contrib subpackage
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-lucene.spec?r1=1.8&r2=1.9&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: python-PasteScript-template_dir_assemble.patch (NEW) - Patch for p...
Author: beornDate: Sun Mar 29 17:23:09 2009 GMT Module: SOURCES Tag: HEAD Log message: - Patch for paste.script.templates.template_dir() Files affected: SOURCES: python-PasteScript-template_dir_assemble.patch (NONE -> 1.1) (NEW) Diffs: Index: SOURCES/python-PasteScript-template_dir_assemble.patch diff -u /dev/null SOURCES/python-PasteScript-template_dir_assemble.patch:1.1 --- /dev/null Sun Mar 29 19:23:09 2009 +++ SOURCES/python-PasteScript-template_dir_assemble.patch Sun Mar 29 19:23:03 2009 @@ -0,0 +1,12 @@ +diff -Nru PasteScript-1.7.3.orig/paste/script/templates.py PasteScript-1.7.3/paste/script/templates.py +--- PasteScript-1.7.3.orig/paste/script/templates.py 2009-03-29 19:07:49.323215602 +0200 PasteScript-1.7.3/paste/script/templates.py2009-03-29 19:15:58.876497792 +0200 +@@ -49,7 +49,7 @@ + assert self._template_dir is not None, ( + "Template %r didn't set _template_dir" % self) + if isinstance( self._template_dir, tuple): +-return self._template_dir ++return os.path.join(self.module_dir(), self._template_dir[1]) + else: + return os.path.join(self.module_dir(), self._template_dir) + ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: python-PasteScript.spec - Added template_dir() patch. Tested only wi...
Author: beornDate: Sun Mar 29 17:24:22 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- Added template_dir() patch. Tested only with Pylons 0.9.7! Needs verification
in other projects
Files affected:
SPECS:
python-PasteScript.spec (1.14 -> 1.15)
Diffs:
Index: SPECS/python-PasteScript.spec
diff -u SPECS/python-PasteScript.spec:1.14 SPECS/python-PasteScript.spec:1.15
--- SPECS/python-PasteScript.spec:1.14 Sun Mar 29 18:14:53 2009
+++ SPECS/python-PasteScript.spec Sun Mar 29 19:24:16 2009
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Narzędzie linii poleceń z obsługą wtyczek
Name: python-PasteScript
Version: 1.7.3
-Release: 0.1
+Release: 0.2
Group: Libraries/Python
License: X11/MIT
Source0:
http://cheeseshop.python.org/packages/source/P/PasteScript/PasteScript-%{version}.tar.gz
@@ -12,6 +12,7 @@
BuildRequires: python-devel
BuildRequires: python-setuptools >= 0.6-0.a9.1
%pyrequires_eq python-modules
+Patch0:%{name}-template_dir_assemble.patch
Requires: python-Beaker >= 0.7.5
Requires: python-cheetah
Requires: python-FormEncode >= 0.7.0
@@ -42,6 +43,7 @@
%prep
%setup -q -n PasteScript-%{version}
+%patch0 -p1
%build
python setup.py build
@@ -71,6 +73,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.15 2009/03/29 17:24:16 beorn
+- Added template_dir() patch. Tested only with Pylons 0.9.7! Needs
verification in other projects
+
Revision 1.14 2009/03/29 16:14:53 beorn
- Up to 1.7.3
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-PasteScript.spec?r1=1.14&r2=1.15&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS (DEVEL): java-modello.spec - unified jdk bconds - run javac - removed...
Author: pawelz Date: Sun Mar 29 17:26:46 2009 GMT
Module: SPECS Tag: DEVEL
Log message:
- unified jdk bconds
- run javac
- removed garbage from changelog
Files affected:
SPECS:
java-modello.spec (1.2 -> 1.2.2.1)
Diffs:
Index: SPECS/java-modello.spec
diff -u SPECS/java-modello.spec:1.2 SPECS/java-modello.spec:1.2.2.1
--- SPECS/java-modello.spec:1.2 Fri Mar 27 21:46:41 2009
+++ SPECS/java-modello.spec Sun Mar 29 19:26:41 2009
@@ -5,14 +5,14 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_without tests # don't build and run tests
+%bcond_withjava_sun# build with gcj
+
%if "%{pld_release}" == "ti"
-%bcond_without java_sun# build with gcj
-%else
-%bcond_withjava_sun# build with java-sun
+%definewith_java_sun 1
%endif
-#
+
%include /usr/lib/rpm/macros.java
-#
+
%definesrcname modello
Summary: Data Model toolkit
Name: java-modello
@@ -71,7 +71,8 @@
export JAVA_HOME="%{java_home}"
install -d build
-#%javac -classpath $CLASSPATH -source 1.5 -target 1.5 -d build $(find -name
'*.java')
+#%%javac -classpath $CLASSPATH -source 1.5 -target 1.5 -d build $(find -name
'*.java')
+%javac -source 1.5 -target 1.5 -d build $(find -name '*.java')
%if %{with javadoc}
%javadoc -d apidocs \
@@ -119,19 +120,13 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.2.2.1 2009/03/29 17:26:41 pawelz
+- unified jdk bconds
+- run javac
+- removed garbage from changelog
+
Revision 1.2 2009/03/27 20:46:41 pawelz
- fixed Source0
Revision 1.1 2009/03/27 20:44:09 pawelz
- initial
-
-Revision 1.2 2009/03/26 21:29:57 paszczus
-- switched to sources
-- use proper javadoc
-- added java_sun bcond
-- conditional bcond for Titanium
-
-Revision 1.1 2009/02/06 18:04:28 pawelz
-- initial PLD release
-
-
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-modello.spec?r1=1.2&r2=1.2.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
SPECS: java-lucene.spec - -contrib Requires: %name = %version
Author: paszczus Date: Sun Mar 29 17:28:33 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- -contrib Requires: %name = %version
Files affected:
SPECS:
java-lucene.spec (1.9 -> 1.10)
Diffs:
Index: SPECS/java-lucene.spec
diff -u SPECS/java-lucene.spec:1.9 SPECS/java-lucene.spec:1.10
--- SPECS/java-lucene.spec:1.9 Sun Mar 29 18:33:26 2009
+++ SPECS/java-lucene.spec Sun Mar 29 19:28:27 2009
@@ -51,7 +51,7 @@
%package contrib
Summary: Contrib packages for lucene
Group: Development/Languages/Java
-Requires: %{name}
+Requires: %{name} = %{version}
%description contrib
Contrib packages for lucene.
@@ -115,6 +115,7 @@
do
cp -a build/contrib/$i/%{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i-%{contrib_ver}.jar
ln -s %{srcname}-$i-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-$i.jar
+%jar -cf %{srcname}-$i-%{contrib_ver}.jar -C build/contrib/$i/classes/java .
done
cp -a build/contrib/db/bdb/%{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb-%{contrib_ver}.jar
ln -s %{srcname}-bdb-%{contrib_ver}.jar
$RPM_BUILD_ROOT%{_javadir}/%{srcname}-bdb.jar
@@ -193,6 +194,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.10 2009/03/29 17:28:27 paszczus
+- -contrib Requires: %name = %version
+
Revision 1.9 2009/03/29 16:33:26 pawelz
- BR: ant
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-lucene.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
SPECS: scalix.spec - BR: java-lucene-contrib - sis package now compiles! - ...
Author: paszczus Date: Sun Mar 29 17:37:28 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- BR: java-lucene-contrib
- sis package now compiles!
- added -sis subpackage (without files for now)
Files affected:
SPECS:
scalix.spec (1.14 -> 1.15)
Diffs:
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.14 SPECS/scalix.spec:1.15
--- SPECS/scalix.spec:1.14 Sun Mar 29 00:25:21 2009
+++ SPECS/scalix.spec Sun Mar 29 19:37:23 2009
@@ -27,7 +27,7 @@
BuildRequires: java-commons-logging
BuildRequires: java-ical4j
BuildRequires: java-log4j
-BuildRequires: java-lucene
+BuildRequires: java-lucene-contrib
BuildRequires: java-mail
BuildRequires: java-servletapi5
BuildRequires: java-sun
@@ -53,6 +53,14 @@
%description mobile
Mobile Scalix
+%package sis
+Summary: Scalix SIS
+Group: Applications/WWW
+Requires: %{name} = %{version}
+
+%description sis
+SIS for Scalix
+
%prep
%setup -qc
%{__tar} zxf scalix-installer-src.tgz
@@ -66,7 +74,7 @@
%build
-CLASSPATH=$(build-classpath activation antlr asm2 commons-cli commons-codec
commons-collections commons-httpclient commons-lang commons-logging ical4j
log4j lucene jsp-api mail servlet)
+CLASSPATH=$(build-classpath activation antlr asm2 commons-cli commons-codec
commons-collections commons-httpclient commons-lang commons-logging ical4j
log4j lucene lucene-snowball jsp-api mail servlet)
#PACKAGES="installer mobile platform sac sis"
PACKAGES="installer sis"
@@ -81,9 +89,12 @@
%install
rm -rf $RPM_BUILD_ROOT
+# Installer
install -d $RPM_BUILD_ROOT%{_sbindir}
install scalix-installer/dist/scalix-installer
$RPM_BUILD_ROOT%{_sbindir}/scalix-installer
+# SIS
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -94,12 +105,20 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/scalix-installer
+%files sis
+%defattr(644,root,root,755)
+
%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.15 2009/03/29 17:37:23 paszczus
+- BR: java-lucene-contrib
+- sis package now compiles!
+- added -sis subpackage (without files for now)
+
Revision 1.14 2009/03/28 23:25:21 paszczus
- added lucene and jsp-api to CLASSPATH;, thx pawelz
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.14&r2=1.15&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: scalix.spec - jdk bconds - include java rpm macros
Author: pawelz Date: Sun Mar 29 17:39:54 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- jdk bconds
- include java rpm macros
Files affected:
SPECS:
scalix.spec (1.15 -> 1.16)
Diffs:
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.15 SPECS/scalix.spec:1.16
--- SPECS/scalix.spec:1.15 Sun Mar 29 19:37:23 2009
+++ SPECS/scalix.spec Sun Mar 29 19:39:49 2009
@@ -1,8 +1,14 @@
# $Revision$, $Date$
-#
# TODO:
# - add subpackages for $PACKAGES
# - fix tomcat.home
+%bcond_with java_sun# build with java-sun
+
+%if "%{pld_release}" == "ti"
+%define with_java_sun 1
+%endif
+
+%include/usr/lib/rpm/macros.java
Summary: Scalix Platform
Name: scalix
Version: 11.4.3
@@ -30,8 +36,9 @@
BuildRequires: java-lucene-contrib
BuildRequires: java-mail
BuildRequires: java-servletapi5
-BuildRequires: java-sun
BuildRequires: python-devel >= 2.2.2
+%{!?with_java_sun:BuildRequires:java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -114,6 +121,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.16 2009/03/29 17:39:49 pawelz
+- jdk bconds
+- include java rpm macros
+
Revision 1.15 2009/03/29 17:37:23 paszczus
- BR: java-lucene-contrib
- sis package now compiles!
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.spec?r1=1.15&r2=1.16&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: xalan-j-javadoc-mem.patch - updated for 2.7.1
Author: paszczus Date: Sun Mar 29 17:52:55 2009 GMT Module: SOURCES Tag: HEAD Log message: - updated for 2.7.1 Files affected: SOURCES: xalan-j-javadoc-mem.patch (1.2 -> 1.3) Diffs: Index: SOURCES/xalan-j-javadoc-mem.patch diff -u SOURCES/xalan-j-javadoc-mem.patch:1.2 SOURCES/xalan-j-javadoc-mem.patch:1.3 --- SOURCES/xalan-j-javadoc-mem.patch:1.2 Thu Mar 8 18:39:39 2007 +++ SOURCES/xalan-j-javadoc-mem.patch Sun Mar 29 19:52:50 2009 @@ -1,6 +1,7 @@ xalan-j/build.xml.org 2007-03-08 16:52:35.0 + -+++ xalan-j/build.xml 2007-03-08 16:53:37.0 + -@@ -1058,7 +1058,7 @@ +diff -ur xalan-j_2_7_1/build.xml xalan-j_2_7_1.new/build.xml +--- xalan-j_2_7_1/build.xml2007-11-22 22:44:01.0 +0100 xalan-j_2_7_1.new/build.xml2009-03-29 19:48:41.271202570 +0200 +@@ -1026,7 +1026,7 @@ http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xalan-j-javadoc-mem.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
SPECS: java-xalan.spec - updated to 2.7.1 - added bcond to build with java_...
Author: paszczus Date: Sun Mar 29 17:53:35 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- updated to 2.7.1
- added bcond to build with java_sun
- rel 0.1 (apidocs missing)
Files affected:
SPECS:
java-xalan.spec (1.54 -> 1.55)
Diffs:
Index: SPECS/java-xalan.spec
diff -u SPECS/java-xalan.spec:1.54 SPECS/java-xalan.spec:1.55
--- SPECS/java-xalan.spec:1.54 Fri Feb 6 01:10:43 2009
+++ SPECS/java-xalan.spec Sun Mar 29 19:53:29 2009
@@ -2,23 +2,32 @@
#
# Conditional build:
%bcond_without doc # do not build documentation
+%bcond_with java_sun# build with java-sun
+
+%if "%{pld_release}" == "ti"
+%define with_java_sun 1
+%endif
+#
+%include/usr/lib/rpm/macros.java
#
%definesrcname xalan
%define_ver%(echo %{version} | tr . _)
+
Summary: XSLT processor for Java
Summary(pl.UTF-8): Procesor XSLT napisany w Javie
Name: java-xalan
-Version: 2.7.0
-Release: 4
+Version: 2.7.1
+Release: 0.1
License: Apache v2.0
Group: Applications/Publishing/XML/Java
Source0:
http://www.apache.org/dist/xml/xalan-j/source/xalan-j_%{_ver}-src.tar.gz
-# Source0-md5: 7859a78a5564cae42c933adcbbecdd01
+# Source0-md5: fc805051f0fe505c7a4b1b5c8db9b9e3
Patch0:xalan-j-javadoc-mem.patch
URL: http://xml.apache.org/xalan-j/
BuildRequires: ant >= 1.5
BuildRequires: jakarta-bcel
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: java-xerces
BuildRequires: java-xml-commons-external
BuildRequires: java_cup
@@ -133,6 +142,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.55 2009/03/29 17:53:29 paszczus
+- updated to 2.7.1
+- added bcond to build with java_sun
+- rel 0.1 (apidocs missing)
+
Revision 1.54 2009/02/06 00:10:43 pawelz
- BR: java-xerces
- export SHELL=/bin/sh (stupid javadoc ant task needs it)
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xalan.spec?r1=1.54&r2=1.55&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: xalan-j-javadoc-mem.patch - another format
Author: paszczus Date: Sun Mar 29 18:00:28 2009 GMT
Module: SOURCES Tag: HEAD
Log message:
- another format
Files affected:
SOURCES:
xalan-j-javadoc-mem.patch (1.3 -> 1.4)
Diffs:
Index: SOURCES/xalan-j-javadoc-mem.patch
diff -u SOURCES/xalan-j-javadoc-mem.patch:1.3
SOURCES/xalan-j-javadoc-mem.patch:1.4
--- SOURCES/xalan-j-javadoc-mem.patch:1.3 Sun Mar 29 19:52:50 2009
+++ SOURCES/xalan-j-javadoc-mem.patch Sun Mar 29 20:00:23 2009
@@ -1,4 +1,3 @@
-diff -ur xalan-j_2_7_1/build.xml xalan-j_2_7_1.new/build.xml
--- xalan-j_2_7_1/build.xml2007-11-22 22:44:01.0 +0100
+++ xalan-j_2_7_1.new/build.xml2009-03-29 19:48:41.271202570 +0200
@@ -1026,7 +1026,7 @@
@@ -19,4 +18,3 @@
destdir="${build.apidocs}"
public="true"
sourcepath="${src.dir}"
-Tylko w xalan-j_2_7_1.new/: build.xml~
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/xalan-j-javadoc-mem.patch?r1=1.3&r2=1.4&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES: gmpc-xspf.patch (NEW) Fix XSPF support
Author: wigetDate: Sun Mar 29 18:01:20 2009 GMT
Module: SOURCES Tag: HEAD
Log message:
Fix XSPF support
Files affected:
SOURCES:
gmpc-xspf.patch (NONE -> 1.1) (NEW)
Diffs:
Index: SOURCES/gmpc-xspf.patch
diff -u /dev/null SOURCES/gmpc-xspf.patch:1.1
--- /dev/null Sun Mar 29 20:01:21 2009
+++ SOURCES/gmpc-xspf.patch Sun Mar 29 20:01:15 2009
@@ -0,0 +1,240 @@
+--- gmpc-0.18.0/configure.ac.wiget 2009-03-09 17:23:10.0 +0100
gmpc-0.18.0/configure.ac 2009-03-29 19:28:50.0 +0200
+@@ -63,34 +63,30 @@ then
+ AC_MSG_ERROR([GMPC plugin requires zlib])
+ fi
+
++PKG_PROG_PKG_CONFIG
+
+-libspiff=0;
++libxspf=0;
+
+-AC_ARG_ENABLE(libspiff,
+-[ --enable-libspiff Use libspiff to parse spiff playlists.],
++AC_ARG_ENABLE(libxspf,
++[ --enable-libxspfUse libxspf to parse XSPF playlists.],
+ [ case "${enableval}" in
+-yes)enable_libspiff=yes;;
+- no)enable_libspiff=no;;
+- *)AC_MSG_ERROR([bad value ${enableval} for --enable-libspiff]);;
++yes)enable_libxspf=yes;;
++ no)enable_libxspf=no;;
++ *)AC_MSG_ERROR([bad value ${enableval} for --enable-libxspf]);;
+ esac],
+- [enable_libspiff=auto])
++ [enable_libxspf=auto])
+
+-if test "x${enable_libspiff}" != xno; then
+-AC_CHECK_HEADER(spiff/spiff_c.h, AC_CHECK_LIB(spiff,
spiff_parse,libspiff=1,libspiff=0),libspiff=0)
+-if test "x${libspiff}" == "x1";
+-then
+-AC_DEFINE(SPIFF,1,["Use or don't use libspiff"])
+-SPIFF_LIBS=-lspiff
+-AC_SUBST(SPIFF_LIBS)
+-else
+-if test "x${enable_libspiff}" == "xyes"; then
+-AC_MSG_ERROR([libspiff not found])
+-fi
+-fi
++if test "x${enable_libxspf}" != xno; then
++PKG_CHECK_MODULES([xspf], [xspf], [
++ AC_DEFINE(XSPF,1,["Use or don't use libxspf"])
++ libxspf=1
++ ], [
++ if test "x${enable_libxspf}" = "xyes"; then
++ AC_MSG_ERROR([libxspf not found])
++ fi])
+ fi
+-
+-PKG_PROG_PKG_CONFIG
+-
++AC_SUBST(xspf_LIBS)
++AC_SUBST(xspf_CFLAGS)
+
+ # Checks for header files.
+ AC_HEADER_STDC
+@@ -475,10 +471,10 @@ if test "x$macige" = "xyes"; then
+ else
+ echo "Use mac integration library: disabled"
+ fi
+-if test "x$libspiff" = "x1"; then
+- echo "Use libspiff library: enabled"
++if test "x$libxspf" = "x1"; then
++ echo "Use libxspf library: enabled"
+ else
+- echo "Use libspiff library: disabled"
++ echo "Use libxspf library: disabled"
+ fi
+ echo "";
+ echo "Now type make to build"
+--- gmpc-0.18.0/src/url_fetcher.c.wiget2009-03-09 17:23:05.0
+0100
gmpc-0.18.0/src/url_fetcher.c 2009-03-29 19:27:26.0 +0200
+@@ -25,8 +25,8 @@
+ #include "playlist3.h"
+ #include "gmpc_easy_download.h"
+
+-#ifdef SPIFF
+-#include
++#ifdef XSPF
++#include
+ #endif
+ /** in gmpc */
+ void pl3_option_menu_activate();
+@@ -89,73 +89,57 @@ static void url_parse_extm3u_file(const
+ }
+ }
+ /***
+- * parse spiff file
++ * parse XSPF file
+ */
+-static void url_parse_spiff_file(const char *data, int size)
++static void url_parse_xspf_file(const char *data, int size, const char *uri)
+ {
+-#ifdef SPIFF
++#ifdef XSPF
+ int songs= 0;
+-const gchar *tempdir = g_get_tmp_dir();
+-gchar *filename = g_build_filename(tempdir, "gmpc-temp-spiff-file",NULL);
+-if(filename)
+-{
+-GError *error = NULL;
+-int has_http = FALSE, has_file = FALSE;
+-char **handlers = mpd_server_get_url_handlers(connection);
+-int i = 0;
+-for (i = 0; handlers && handlers[i]; i++) {
+-if (strcmp(handlers[i], "http://";) == 0) {
+-has_http = TRUE;
+-} else if (strcmp(handlers[i], "file://") == 0) {
+-has_file = TRUE;
+-}
+-}
+-if (handlers)
+-g_strfreev(handlers);
+-
+-g_file_set_contents(filename, data,(gssize)size, &error);
+-if(!error)
+-{
+-struct spiff_track *strack;
+-struct spiff_mvalue *sloc;
+-struct spiff_list *slist = spiff_parse(filename);
+-if (slist != NULL)
+-{
+-SPIFF_LIST_FOREACH_TRACK(slist, strack) {
+-SPIFF_TRACK_FOREACH_LOCATION(strack, sloc) {
+-char *scheme = g_uri_parse_scheme(sloc->value);
+-if(scheme)
+-{
+-debug_printf(DEBUG_INFO, "Trying to add url: %s",
sloc->value);
+-if(strcmp(scheme, "http") == 0 && has_http)
+-{
+-mpd
SPECS: java-xalan.spec - another way for Patch0
Author: paszczus Date: Sun Mar 29 18:06:32 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- another way for Patch0
Files affected:
SPECS:
java-xalan.spec (1.55 -> 1.56)
Diffs:
Index: SPECS/java-xalan.spec
diff -u SPECS/java-xalan.spec:1.55 SPECS/java-xalan.spec:1.56
--- SPECS/java-xalan.spec:1.55 Sun Mar 29 19:53:29 2009
+++ SPECS/java-xalan.spec Sun Mar 29 20:06:27 2009
@@ -79,6 +79,7 @@
%prep
%setup -q -n xalan-j_%{_ver}
+%{__sed} -i -e 's,\r$,,' build.xml
%patch0 -p1
find . -name "*.jar" ! -name "xalan2jdoc.jar" ! -name
"stylebook-1.0-b3_xalan-2.jar" -exec rm -f {} \;
@@ -142,6 +143,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.56 2009/03/29 18:06:27 paszczus
+- another way for Patch0
+
Revision 1.55 2009/03/29 17:53:29 paszczus
- updated to 2.7.1
- added bcond to build with java_sun
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xalan.spec?r1=1.55&r2=1.56&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: scalix.spec - tomcat related stuff: - install scalix-sis war - insta...
Author: pawelz Date: Sun Mar 29 18:10:00 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- tomcat related stuff:
- install scalix-sis war
- install scalix-sis context.xml
Files affected:
SPECS:
scalix.spec (1.16 -> 1.17)
Diffs:
Index: SPECS/scalix.spec
diff -u SPECS/scalix.spec:1.16 SPECS/scalix.spec:1.17
--- SPECS/scalix.spec:1.16 Sun Mar 29 19:39:49 2009
+++ SPECS/scalix.spec Sun Mar 29 20:09:55 2009
@@ -18,6 +18,7 @@
Group: Applications/WWW
Source0:
http://downloads.scalix.com/.opensource/11.4.3/%{name}-%{version}-GA-source.tgz
# Source0-md5: fb4794f841319ed07605a8619e5a9c36
+Source1: %{name}-sis-context.xml
Patch0:%{name}-python25_26.patch
Patch1:%{name}-merlin-fixes.patch
Patch2:%{name}-build.patch
@@ -96,17 +97,22 @@
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_datadir}/scalix
+
# Installer
install -d $RPM_BUILD_ROOT%{_sbindir}
install scalix-installer/dist/scalix-installer
$RPM_BUILD_ROOT%{_sbindir}/scalix-installer
# SIS
+install %SOURCE1
$RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
+cp -a scalix-sis/build/war $RPM_BUILD_ROOT%{_datadir}/scalix/scalix-sis
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
+%dir %{_datadir}/scalix
%files installer
%defattr(644,root,root,755)
@@ -114,6 +120,8 @@
%files sis
%defattr(644,root,root,755)
+%config(noreplace)
%{_sharedstatedir}/tomcat/conf/Catalina/localhost/scalix-sis.xml
+%{_datadir}/scalix/scalix-sis
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -121,6 +129,11 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.17 2009/03/29 18:09:55 pawelz
+- tomcat related stuff:
+- install scalix-sis war
+- install scalix-sis context.xml
+
Revision 1.16 2009/03/29 17:39:49 pawelz
- jdk bconds
- include java rpm macros
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scalix.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
SOURCES: scalix-sis-context.xml (NEW) - initial - tomcat config for scalix-sis
Author: pawelz Date: Sun Mar 29 18:11:19 2009 GMT Module: SOURCES Tag: HEAD Log message: - initial - tomcat config for scalix-sis Files affected: SOURCES: scalix-sis-context.xml (NONE -> 1.1) (NEW) Diffs: Index: SOURCES/scalix-sis-context.xml diff -u /dev/null SOURCES/scalix-sis-context.xml:1.1 --- /dev/null Sun Mar 29 20:11:20 2009 +++ SOURCES/scalix-sis-context.xml Sun Mar 29 20:11:14 2009 @@ -0,0 +1,6 @@ + + + + + ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SPECS: gmpc.spec - added xspf.patch (update to new API) - release 2
Author: wigetDate: Sun Mar 29 18:14:17 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- added xspf.patch (update to new API)
- release 2
Files affected:
SPECS:
gmpc.spec (1.26 -> 1.27)
Diffs:
Index: SPECS/gmpc.spec
diff -u SPECS/gmpc.spec:1.26 SPECS/gmpc.spec:1.27
--- SPECS/gmpc.spec:1.26Sat Mar 28 19:23:36 2009
+++ SPECS/gmpc.spec Sun Mar 29 20:14:12 2009
@@ -3,13 +3,14 @@
Summary(pl.UTF-8): Odtwarzacz Gnome Music Player Client
Name: gmpc
Version: 0.18.0
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications/Sound
Source0: http://dl.sourceforge.net/musicpd/%{name}-%{version}.tar.gz
# Source0-md5: 4a0d3a4bd03686f4e51b23110186cba0
Patch0:%{name}-desktop.patch
-URL: http://gmpc.sarine.nl/
+Patch1:%{name}-xspf.patch
+URL: http://gmpc.wikia.com
BuildRequires: autoconf >= 2.59
BuildRequires: automake
BuildRequires: curl-devel
@@ -21,6 +22,7 @@
BuildRequires: libglade2-devel
BuildRequires: libmpd-devel >= 0.18.0
BuildRequires: libtool
+BuildRequires: libxspf-devel
BuildRequires: pkgconfig >= 0.9
BuildRequires: rpmbuild(macros) >= 1.311
BuildRequires: xorg-lib-libSM-devel
@@ -61,6 +63,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__intltoolize}
@@ -121,6 +124,10 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.27 2009/03/29 18:14:12 wiget
+- added xspf.patch (update to new API)
+- release 2
+
Revision 1.26 2009/03/28 18:23:36 wiget
- serverstats and favorites integrated into main program
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gmpc.spec?r1=1.26&r2=1.27&f=u
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - updated
Author: arekmDate: Sun Mar 29 18:16:46 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- updated
Files affected:
SOURCES:
linux-2.6-grsec_full.patch (1.1.2.56 -> 1.1.2.57)
Diffs:
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.56
SOURCES/linux-2.6-grsec_full.patch:1.1.2.57
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.56 Sun Mar 29 15:32:04 2009
+++ SOURCES/linux-2.6-grsec_full.patch Sun Mar 29 20:16:39 2009
@@ -19623,8 +19623,8 @@
+#endif
struct tgid_iter iter;
struct pid_namespace *ns;
-
-@@ -2901,6 +2915,20 @@
+
+@@ -2901,6 +2901,20 @@
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -19645,15 +19645,16 @@
filp->f_pos = iter.tgid + TGID_OFFSET;
if (!vx_proc_task_visible(iter.task))
continue;
-@@ -2930,7 +2958,7 @@
- #ifdef CONFIG_SCHED_DEBUG
- REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
- #endif
--#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
-+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) &&
!defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- INF("syscall", S_IRUSR, proc_pid_syscall),
+@@ -2910,6 +2984,9 @@
+ #ifdef CONFIG_TASK_IO_ACCOUNTING
+ INF("io", S_IRUGO, proc_tid_io_accounting),
#endif
- INF("cmdline", S_IRUGO, proc_pid_cmdline),
++#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
++ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
++#endif
+ };
+
+ static int proc_tid_base_readdir(struct file * filp,
diff -urNp linux-2.6.29/fs/proc/cmdline.c linux-2.6.29/fs/proc/cmdline.c
--- linux-2.6.29/fs/proc/cmdline.c 2009-03-23 19:12:14.0 -0400
+++ linux-2.6.29/fs/proc/cmdline.c 2009-03-28 14:26:20.0 -0400
@@ -34654,25 +34655,6 @@
if (vm_flags & VM_EXECUTABLE)
added_exe_file_vma(mm);
} else if (vm_flags & VM_SHARED) {
-@@ -1215,12 +1348,18 @@ munmap_back:
- vma_link(mm, vma, prev, rb_link, rb_parent);
- file = vma->vm_file;
-
-+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (vma_m)
-+ pax_mirror_vma(vma_m, vma);
-+#endif
-+
- /* Once vma denies write, undo our temporary denial count */
- if (correct_wcount)
- atomic_inc(&inode->i_writecount);
- out:
- // mm->total_vm += len >> PAGE_SHIFT;
- vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
-+ track_exec_limit(mm, addr, addr + len, vm_flags);
- if (vm_flags & VM_LOCKED) {
- /*
-* makes pages present; downgrades, drops, reacquires mmap_sem
@@ -1243,6 +1382,12 @@ unmap_and_free_vma:
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
charged = 0;
@@ -34750,6 +34732,27 @@
/* requested length too big for entire address space */
if (len > TASK_SIZE)
+@@ -1348,6 +1348,12 @@
+ vma_link(mm, vma, prev, rb_link, rb_parent);
+ file = vma->vm_file;
+
++#ifdef CONFIG_PAX_SEGMEXEC
++ if (vma_m)
++ pax_mirror_vma(vma_m, vma);
++#endif
++
++
+ /* Once vma denies write, undo our temporary denial count */
+ if (correct_wcount)
+ atomic_inc(&inode->i_writecount);
+@@ -1355,6 +1361,7 @@
+ // mm->total_vm += len >> PAGE_SHIFT;
+ vx_vmpages_add(mm, len >> PAGE_SHIFT);
+ vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
++ track_exec_limit(mm, addr, addr + len, vm_flags);
+ if (vm_flags & VM_LOCKED) {
+ /*
+* makes pages present; downgrades, drops, reacquires mmap_sem
@@ -1352,6 +1506,10 @@ arch_get_unmapped_area_topdown(struct fi
if (flags & MAP_FIXED)
return addr;
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec_full.patch?r1=1.1.2.56&r2=1.1.2.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
SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - crap
Author: arekmDate: Sun Mar 29 18:25:22 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- crap
Files affected:
SOURCES:
linux-2.6-grsec_full.patch (1.1.2.57 -> 1.1.2.58)
Diffs:
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.57
SOURCES/linux-2.6-grsec_full.patch:1.1.2.58
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.57 Sun Mar 29 20:16:39 2009
+++ SOURCES/linux-2.6-grsec_full.patch Sun Mar 29 20:25:15 2009
@@ -19623,8 +19623,8 @@
+#endif
struct tgid_iter iter;
struct pid_namespace *ns;
-
-@@ -2901,6 +2901,20 @@
+
+@@ -2901,6 +2915,20 @@
for (iter = next_tgid(ns, iter);
iter.task;
iter.tgid += 1, iter = next_tgid(ns, iter)) {
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec_full.patch?r1=1.1.2.57&r2=1.1.2.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
SOURCES (LINUX_2_6): linux-2.6-grsec_full.patch - updated
Author: arekmDate: Sun Mar 29 18:49:53 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- updated
Files affected:
SOURCES:
linux-2.6-grsec_full.patch (1.1.2.58 -> 1.1.2.59)
Diffs:
Index: SOURCES/linux-2.6-grsec_full.patch
diff -u SOURCES/linux-2.6-grsec_full.patch:1.1.2.58
SOURCES/linux-2.6-grsec_full.patch:1.1.2.59
--- SOURCES/linux-2.6-grsec_full.patch:1.1.2.58 Sun Mar 29 20:25:15 2009
+++ SOURCES/linux-2.6-grsec_full.patch Sun Mar 29 20:49:46 2009
@@ -19387,7 +19387,7 @@
diff -urNp linux-2.6.29/fs/proc/base.c linux-2.6.29/fs/proc/base.c
--- linux-2.6.29/fs/proc/base.c2009-03-23 19:12:14.0 -0400
+++ linux-2.6.29/fs/proc/base.c2009-03-28 14:26:20.0 -0400
-@@ -223,6 +223,9 @@ static int check_mem_permission(struct t
+@@ -225,6 +225,9 @@
if (task == current)
return 0;
@@ -19397,7 +19397,7 @@
/*
* If current is actively ptrace'ing, and would also be
* permitted to freshly attach with ptrace now, permit it.
-@@ -300,12 +303,26 @@ out:
+@@ -302,12 +305,26 @@
return res;
}
@@ -19424,7 +19424,7 @@
do {
nwords += 2;
} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -531,7 +548,7 @@ static int proc_pid_limits(struct task_s
+@@ -533,7 +550,7 @@
return count;
}
@@ -19433,7 +19433,7 @@
static int proc_pid_syscall(struct task_struct *task, char *buffer)
{
long nr;
-@@ -1455,7 +1472,11 @@ static struct inode *proc_pid_make_inode
+@@ -1457,7 +1474,11 @@
rcu_read_lock();
cred = __task_cred(task);
inode->i_uid = cred->euid;
@@ -19444,8 +19444,8 @@
+#endif
rcu_read_unlock();
}
- security_task_to_inode(task, inode);
-@@ -1473,6 +1494,9 @@ static int pid_getattr(struct vfsmount *
+ /* procfs is xid tagged */
+@@ -1477,6 +1498,9 @@
struct inode *inode = dentry->d_inode;
struct task_struct *task;
const struct cred *cred;
@@ -19455,7 +19455,7 @@
generic_fillattr(inode, stat);
-@@ -1480,12 +1504,34 @@ static int pid_getattr(struct vfsmount *
+@@ -1484,12 +1508,34 @@
stat->uid = 0;
stat->gid = 0;
task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -19491,7 +19491,7 @@
}
}
rcu_read_unlock();
-@@ -1517,11 +1563,20 @@ static int pid_revalidate(struct dentry
+@@ -1521,11 +1567,20 @@
if (task) {
if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -19512,7 +19512,7 @@
rcu_read_unlock();
} else {
inode->i_uid = 0;
-@@ -1894,12 +1949,22 @@ static const struct file_operations proc
+@@ -1898,12 +1953,22 @@
static int proc_fd_permission(struct inode *inode, int mask)
{
int rv;
@@ -19537,9 +19537,9 @@
return rv;
}
-@@ -2008,6 +2073,9 @@ static struct dentry *proc_pident_lookup
- if (!task)
- goto out_no_task;
+@@ -2019,6 +2084,9 @@
+ !memcmp(dentry->d_name.name, "ninfo", 5)))
+ goto out;
+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
+ goto out;
@@ -19547,7 +19547,7 @@
/*
* Yes, it does not scale. And it should not. Don't add
* new entries into /proc// without very good reasons.
-@@ -2052,6 +2120,9 @@ static int proc_pident_readdir(struct fi
+@@ -2063,6 +2131,9 @@
if (!task)
goto out_no_task;
@@ -19557,7 +19557,7 @@
ret = 0;
i = filp->f_pos;
switch (i) {
-@@ -2412,6 +2483,9 @@ static struct dentry *proc_base_lookup(s
+@@ -2423,6 +2494,9 @@
if (p > last)
goto out;
@@ -19567,7 +19567,7 @@
error = proc_base_instantiate(dir, dentry, task, p);
out:
-@@ -2498,7 +2572,7 @@ static const struct pid_entry tgid_base_
+@@ -2512,7 +2586,7 @@
#ifdef CONFIG_SCHED_DEBUG
REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
#endif
@@ -19576,17 +19576,7 @@
INF("syscall",S_IRUSR, proc_pid_syscall),
#endif
INF("cmdline",S_IRUGO, proc_pid_cmdline),
-@@ -2556,6 +2630,9 @@ static const struct pid_entry tgid_base_
- #ifdef CONFIG_TASK_IO_ACCOUNTING
- INF("io", S_IRUGO, proc_tgid_io_accounting),
- #endif
-+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
-+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
-+#endif
- };
-
- static int proc_tgid_base_readdir(struct file * filp,
-@@ -2776,7 +2776,14 @@
+@@ -2702,7 +2776,14 @@
if (!inode)
goto out;
@@ -19601,7 +19591,7 @@
inode->i_op = &proc_tgid_base_inode_operations;
inode->i_fop = &proc_tgid_base_operations;
inode->i_flags|=S_IMMUTABLE;
-@@ -2817,8 +2824,11 @@
+@@ -2743,8 +2824,11 @@
rcu_read_unl
SPECS: gmpc.spec - drop unsupported by glibc javanese translation
Author: wigetDate: Sun Mar 29 19:00:21 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- drop unsupported by glibc javanese translation
Files affected:
SPECS:
gmpc.spec (1.27 -> 1.28)
Diffs:
Index: SPECS/gmpc.spec
diff -u SPECS/gmpc.spec:1.27 SPECS/gmpc.spec:1.28
--- SPECS/gmpc.spec:1.27Sun Mar 29 20:14:12 2009
+++ SPECS/gmpc.spec Sun Mar 29 21:00:15 2009
@@ -3,7 +3,7 @@
Summary(pl.UTF-8): Odtwarzacz Gnome Music Player Client
Name: gmpc
Version: 0.18.0
-Release: 2
+Release: 3
License: GPL v2+
Group: X11/Applications/Sound
Source0: http://dl.sourceforge.net/musicpd/%{name}-%{version}.tar.gz
@@ -85,6 +85,9 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# drop javanese translation, need glibc support first
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/jv
+
%find_lang gmpc
%clean
@@ -124,6 +127,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.28 2009/03/29 19:00:15 wiget
+- drop unsupported by glibc javanese translation
+
Revision 1.27 2009/03/29 18:14:12 wiget
- added xspf.patch (update to new API)
- release 2
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gmpc.spec?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
SOURCES (LINUX_2_6): kernel-grsec_fixes.patch - updated
Author: arekmDate: Sun Mar 29 19:10:19 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- updated
Files affected:
SOURCES:
kernel-grsec_fixes.patch (1.1.4.9 -> 1.1.4.10)
Diffs:
Index: SOURCES/kernel-grsec_fixes.patch
diff -u SOURCES/kernel-grsec_fixes.patch:1.1.4.9
SOURCES/kernel-grsec_fixes.patch:1.1.4.10
--- SOURCES/kernel-grsec_fixes.patch:1.1.4.9Fri Jan 23 16:42:14 2009
+++ SOURCES/kernel-grsec_fixes.patchSun Mar 29 21:10:14 2009
@@ -25,28 +25,28 @@
+}
--- a/grsecurity/grsec_sock.c 2008-03-24 00:24:22.482633101 +0100
+++ c/grsecurity/grsec_sock.c 2008-03-24 00:27:01.971671763 +0100
-@@ -251,23 +251,26 @@ __u32
+@@ -247,23 +247,26 @@
gr_cap_rtnetlink(struct sock *sock)
{
#ifdef CONFIG_GRKERNSEC
+ struct acl_subject_label *curracl;
+ kernel_cap_t cap_dropp = __cap_empty_set, cap_mask = __cap_empty_set;
+
- if (!gr_acl_is_enabled())
- return current->cap_effective;
+ if (!gr_acl_is_enabled())
+ return current_cap();
- else if (sock->sk_protocol == NETLINK_ISCSI &&
-- cap_raised(current->cap_effective, CAP_SYS_ADMIN) &&
-- gr_task_is_capable(current, CAP_SYS_ADMIN))
-- return current->cap_effective;
+- cap_raised(current_cap(), CAP_SYS_ADMIN) &&
+- gr_is_capable(CAP_SYS_ADMIN))
+- return current_cap();
- else if (sock->sk_protocol == NETLINK_AUDIT &&
-- cap_raised(current->cap_effective, CAP_AUDIT_WRITE) &&
-- gr_task_is_capable(current, CAP_AUDIT_WRITE) &&
-- cap_raised(current->cap_effective, CAP_AUDIT_CONTROL) &&
-- gr_task_is_capable(current, CAP_AUDIT_CONTROL))
-- return current->cap_effective;
-- else if (cap_raised(current->cap_effective, CAP_NET_ADMIN) &&
-- gr_task_is_capable(current, CAP_NET_ADMIN))
-- return current->cap_effective;
+- cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
+- gr_is_capable(CAP_AUDIT_WRITE) &&
+- cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
+- gr_is_capable(CAP_AUDIT_CONTROL))
+- return current_cap();
+- else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
+- gr_is_capable(CAP_NET_ADMIN))
+- return current_cap();
- else
- return __cap_empty_set;
+ else {
@@ -57,15 +57,15 @@
+
+ while ((curracl = curracl->parent_subject)) {
+ cap_dropp = cap_combine(cap_dropp,
-+ cap_intersect(curracl->cap_lower,
-+ cap_drop(cap_mask, curracl->cap_mask)));
++ cap_intersect(curracl->cap_lower,
++ cap_drop(cap_mask,
curracl->cap_mask)));
+ cap_mask = cap_combine(cap_mask, curracl->cap_mask);
+ }
+ return cap_drop(current->cap_effective,
+ cap_intersect(cap_dropp, cap_mask));
+ }
#else
- return current->cap_effective;
+ return current_cap();
#endif
diff -upr a/include/linux/grsecurity.h c/include/linux/grsecurity.h
--- a/include/linux/grsecurity.h 2007-12-01 00:54:57.224769000 +
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-grsec_fixes.patch?r1=1.1.4.9&r2=1.1.4.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
SOURCES (LINUX_2_6): linux-2.6-grsec-common.patch - updated
Author: arekmDate: Sun Mar 29 19:05:50 2009 GMT
Module: SOURCES Tag: LINUX_2_6
Log message:
- updated
Files affected:
SOURCES:
linux-2.6-grsec-common.patch (1.1.2.2.2.10 -> 1.1.2.2.2.11)
Diffs:
Index: SOURCES/linux-2.6-grsec-common.patch
diff -u SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.10
SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.11
--- SOURCES/linux-2.6-grsec-common.patch:1.1.2.2.2.10 Sun Jan 18 03:07:34 2009
+++ SOURCES/linux-2.6-grsec-common.patchSun Mar 29 21:05:45 2009
@@ -27,47 +27,13 @@
===
--- a/kernel/capability.c~ 2007-12-11 00:46:02.0 +0100
+++ a/kernel/capability.c 2007-12-11 01:35:00.244481500 +0100
-@@ -253,6 +253,8 @@ int __capable(struct task_struct *t, int
- }
+@@ -322,6 +322,8 @@
+
int capable_nolog(int cap)
{
+ if (vs_check_bit(VXC_CAP_MASK, cap) && !vx_mcaps(1L << cap))
+ return 0;
- if (has_capability(current, cap) && gr_is_capable_nolog(cap)) {
+ if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
current->flags |= PF_SUPERPRIV;
return 1;
-===
-=== vserver netlink protection
-===
a/security/commoncap.c~2007-12-10 23:52:36.0 +0100
-+++ a/security/commoncap.c 2007-12-11 01:43:04.426741000 +0100
-@@ -27,7 +27,7 @@
-
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
-- NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
-+ NETLINK_CB(skb).eff_cap = cap_intersect(gr_cap_rtnetlink(sk),
vx_mbcaps(current->cap_effective));
- return 0;
- }
-
-===
-=== vserver hooks in cap_capable_nolog
-===
i/security/commoncap.c12008-10-28 21:28:07.873037469 +0100
-+++ i/security/commoncap.c 2008-10-28 21:36:20.429660261 +0100
-@@ -76,8 +76,14 @@ int cap_capable (struct task_struct *tsk
-
- int cap_capable_nolog (struct task_struct *tsk, int cap)
- {
-+ struct vx_info *vxi = tsk->vx_info;
-+ /* special case SETUP */ /* co to jest? - zbyniu */
-+ if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) &&
-+ cap_raised(tsk->cap_effective, cap))
-+ return 0;
-+
- /* tsk = current for all callers */
-- if (cap_raised(tsk->cap_effective, cap) && gr_is_capable_nolog(cap))
-+ if (vx_cap_raised(vxi, tsk->cap_effective, cap) &&
gr_is_capable_nolog(cap))
- return 0;
-
- return -EPERM;
+
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsec-common.patch?r1=1.1.2.2.2.10&r2=1.1.2.2.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
SOURCES (LINUX_2_6): kernel-reiser4.patch - updated for .29
Author: arekmDate: Sun Mar 29 19:36:21 2009 GMT Module: SOURCES Tag: LINUX_2_6 Log message: - updated for .29 Files affected: SOURCES: kernel-reiser4.patch (1.2.2.4 -> 1.2.2.5) Diffs: Index: SOURCES/kernel-reiser4.patch diff -u SOURCES/kernel-reiser4.patch:1.2.2.4 SOURCES/kernel-reiser4.patch:1.2.2.5 --- SOURCES/kernel-reiser4.patch:1.2.2.4Tue Mar 24 12:49:07 2009 +++ SOURCES/kernel-reiser4.patchSun Mar 29 21:36:15 2009 @@ -38515,7 +38515,7 @@ + + object->i_mode = data->mode; + /* this should be plugin decision */ -+ object->i_uid = current->fsuid; ++ object->i_uid = current_fsuid(); + object->i_mtime = object->i_atime = object->i_ctime = CURRENT_TIME; + + /* support for BSD style group-id assignment. See mount's manual page @@ -38529,7 +38529,7 @@ + /* sguid is inherited by sub-directories */ + object->i_mode |= S_ISGID; + } else -+ object->i_gid = current->fsgid; ++ object->i_gid = current_fsgid(); + + /* this object doesn't have stat-data yet */ + reiser4_inode_set_flag(object, REISER4_NO_SD); CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-reiser4.patch?r1=1.2.2.4&r2=1.2.2.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
SOURCES (LINUX_2_6): kernel-grsec_fixes.patch - fix
Author: arekmDate: Sun Mar 29 20:01:02 2009 GMT Module: SOURCES Tag: LINUX_2_6 Log message: - fix Files affected: SOURCES: kernel-grsec_fixes.patch (1.1.4.10 -> 1.1.4.11) Diffs: Index: SOURCES/kernel-grsec_fixes.patch diff -u SOURCES/kernel-grsec_fixes.patch:1.1.4.10 SOURCES/kernel-grsec_fixes.patch:1.1.4.11 --- SOURCES/kernel-grsec_fixes.patch:1.1.4.10 Sun Mar 29 21:10:14 2009 +++ SOURCES/kernel-grsec_fixes.patchSun Mar 29 22:00:57 2009 @@ -61,7 +61,7 @@ + cap_drop(cap_mask, curracl->cap_mask))); + cap_mask = cap_combine(cap_mask, curracl->cap_mask); + } -+ return cap_drop(current->cap_effective, ++ return cap_drop(current_cap(), + cap_intersect(cap_dropp, cap_mask)); + } #else CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-grsec_fixes.patch?r1=1.1.4.10&r2=1.1.4.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
SPECS: haproxy.spec - 1.3.17
Author: areq Date: Sun Mar 29 20:01:22 2009 GMT
Module: SPECS Tag: HEAD
Log message:
- 1.3.17
Files affected:
SPECS:
haproxy.spec (1.33 -> 1.34)
Diffs:
Index: SPECS/haproxy.spec
diff -u SPECS/haproxy.spec:1.33 SPECS/haproxy.spec:1.34
--- SPECS/haproxy.spec:1.33 Mon Mar 23 10:44:34 2009
+++ SPECS/haproxy.spec Sun Mar 29 22:01:14 2009
@@ -2,12 +2,12 @@
Summary: haproxy - high-performance TCP/HTTP load balancer
Summary(pl.UTF-8): haproxy - wysoko wydajny load balancer TCP/HTTP
Name: haproxy
-Version: 1.3.16
+Version: 1.3.17
Release: 1
License: GPL v2
Group: Networking/Daemons
Source0: http://haproxy.1wt.eu/download/1.3/src/%{name}-%{version}.tar.gz
-# Source0-md5: f1e05c1db9d0157f7aa1bad03416c1a7
+# Source0-md5: 423ad955828a2de1803410a4405696f2
Source1: %{name}.init
Source2: %{name}.cfg
URL: http://haproxy.1wt.eu/
@@ -146,6 +146,9 @@
All persons listed below can be reached at @pld-linux.org
$Log$
+Revision 1.34 2009/03/29 20:01:14 areq
+- 1.3.17
+
Revision 1.33 2009/03/23 09:44:34 areq
- 1.3.16
CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/haproxy.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
DISTFILES: haproxy-1.3.17.tar.gz
Files fetched: 1 STORED: http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.17.tar.gz 423ad955828a2de1803410a4405696f2 haproxy-1.3.17.tar.gz Size: 635984 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
SOURCES: kernel-desktop-grsec_minimal.config (NEW) - init
Author: shadzik Date: Sun Mar 29 20:25:56 2009 GMT Module: SOURCES Tag: HEAD Log message: - init Files affected: SOURCES: kernel-desktop-grsec_minimal.config (NONE -> 1.1) (NEW) Diffs: Index: SOURCES/kernel-desktop-grsec_minimal.config diff -u /dev/null SOURCES/kernel-desktop-grsec_minimal.config:1.1 --- /dev/null Sun Mar 29 22:25:57 2009 +++ SOURCES/kernel-desktop-grsec_minimal.config Sun Mar 29 22:25:50 2009 @@ -0,0 +1,20 @@ +# +# Grsecurity +# +CONFIG_GRKERNSEC=y + +# +# Filesystem Protections +# +CONFIG_GRKERNSEC_PROC=y +# CONFIG_GRKERNSEC_PROC_USER is not set +CONFIG_GRKERNSEC_PROC_USERGROUP=y +CONFIG_GRKERNSEC_PROC_GID=17 +CONFIG_GRKERNSEC_PROC_ADD=y +CONFIG_GRKERNSEC_LINK=y +CONFIG_GRKERNSEC_FIFO=y +CONFIG_GRKERNSEC_PROC_IPADDR=y +CONFIG_GRKERNSEC_SHM=y +CONFIG_GRKERNSEC_SYSCTL=y +# CONFIG_GRKERNSEC_SYSCTL_ON is not set + ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SOURCES (Titanium): kernel-desktop-grsec-minimal.patch - updated for .29
Author: shadzik Date: Sun Mar 29 20:27:28 2009 GMT
Module: SOURCES Tag: Titanium
Log message:
- updated for .29
Files affected:
SOURCES:
kernel-desktop-grsec-minimal.patch (1.8 -> 1.8.4.1)
Diffs:
Index: SOURCES/kernel-desktop-grsec-minimal.patch
diff -u SOURCES/kernel-desktop-grsec-minimal.patch:1.8
SOURCES/kernel-desktop-grsec-minimal.patch:1.8.4.1
--- SOURCES/kernel-desktop-grsec-minimal.patch:1.8 Sat Nov 18 02:19:32 2006
+++ SOURCES/kernel-desktop-grsec-minimal.patch Sun Mar 29 22:27:22 2009
@@ -1,28 +1,7 @@
linux-2.6.18.orig/Makefile 2006-11-18 01:09:45.0 +
-+++ linux-2.6.18.grsec-minimal/Makefile2006-11-18 01:11:02.0
+
-@@ -552,7 +552,7 @@
-
-
- ifeq ($(KBUILD_EXTMOD),)
--core-y+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
grsecurity/
-
- vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
-$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
linux-2.6.18.orig/arch/sparc/Makefile 2006-09-20 03:42:06.0
+
-+++ linux-2.6.18.grsec-minimal/arch/sparc/Makefile 2006-11-18
01:11:02.0 +
-@@ -34,7 +34,7 @@
- # Renaming is done to avoid confusing pattern matching rules in 2.5.45
(multy-)
- INIT_Y:= $(patsubst %/, %/built-in.o, $(init-y))
- CORE_Y:= $(core-y)
--CORE_Y+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+CORE_Y+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
grsecurity/
- CORE_Y:= $(patsubst %/, %/built-in.o, $(CORE_Y))
- DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y))
- NET_Y := $(patsubst %/, %/built-in.o, $(net-y))
linux-2.6.18.orig/drivers/char/keyboard.c 2006-09-20 03:42:06.0
+
-+++ linux-2.6.18.grsec-minimal/drivers/char/keyboard.c 2006-11-18
01:11:02.0 +
-@@ -618,6 +618,16 @@
+diff -urNp linux-2.6.26.orig/drivers/char/keyboard.c
linux-2.6.26/drivers/char/keyboard.c
+--- linux-2.6.26.orig/drivers/char/keyboard.c 2008-09-01 11:43:37.0
+0200
linux-2.6.26/drivers/char/keyboard.c 2008-09-02 12:17:21.0
+0200
+@@ -633,6 +633,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
return; /* SAK is allowed even in raw mode */
@@ -36,30 +15,33 @@
+ }
+#endif
+
- fn_handler[value](vc, regs);
+ fn_handler[value](vc);
}
linux-2.6.18.orig/drivers/pci/proc.c 2006-09-20 03:42:06.0
+
-+++ linux-2.6.18.grsec-minimal/drivers/pci/proc.c 2006-11-18
01:11:02.0 +
-@@ -467,7 +467,15 @@
+diff -urNp linux-2.6.26.orig/drivers/pci/proc.c linux-2.6.26/drivers/pci/proc.c
+--- linux-2.6.26.orig/drivers/pci/proc.c 2008-09-01 11:43:47.0
+0200
linux-2.6.26/drivers/pci/proc.c2008-09-02 12:17:21.0 +0200
+@@ -472,7 +472,16 @@ static const struct file_operations proc
+ static int __init pci_proc_init(void)
{
- struct proc_dir_entry *entry;
struct pci_dev *dev = NULL;
++
+#ifdef CONFIG_GRKERNSEC_PROC_ADD
+#ifdef CONFIG_GRKERNSEC_PROC_USER
-+ proc_bus_pci_dir = proc_mkdir_mode("pci", S_IRUSR | S_IXUSR, proc_bus);
++ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ proc_bus_pci_dir = proc_mkdir_mode("pci", S_IRUSR | S_IXUSR | S_IRGRP |
S_IXGRP, proc_bus);
++ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR |
S_IRGRP | S_IXGRP, NULL);
+#endif
+#else
- proc_bus_pci_dir = proc_mkdir("pci", proc_bus);
+ proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
+#endif
- entry = create_proc_entry("devices", 0, proc_bus_pci_dir);
- if (entry)
- entry->proc_fops = &proc_bus_pci_dev_operations;
linux-2.6.18.orig/fs/Kconfig 2006-09-20 03:42:06.0 +
-+++ linux-2.6.18.grsec-minimal/fs/Kconfig 2006-11-18 01:11:02.0
+
-@@ -817,7 +817,7 @@
+ proc_create("devices", 0, proc_bus_pci_dir,
+ &proc_bus_pci_dev_operations);
+ proc_initialized = 1;
+diff -urNp linux-2.6.26.orig/fs/Kconfig linux-2.6.26/fs/Kconfig
+--- linux-2.6.26.orig/fs/proc/Kconfig 2008-09-01 11:43:58.0 +0200
linux-2.6.26/fs/proc/Kconfig 2008-09-02 12:17:21.0 +0200
+@@ -926,12 +926,12 @@ config PROC_FS
config PROC_KCORE
bool "/proc/kcore support" if !ARM
@@ -68,277 +50,31 @@
config PROC_VMCORE
bool "/proc/vmcore support (EXPERIMENTAL)"
linux-2.6.18.orig/fs/namei.c 2006-09-20 03:42:06.0 +
-+++ linux-2.6.18.grsec-minimal/fs/namei.c 2006-11-18 01:11:02.0
+
-@@ -32,6 +32,7 @@
- #
