DISTFILES: memcached: memcached-1.5.20.tar.gz
Request by: paszczus Files fetched: 1 STORED: http://www.memcached.org/files/memcached-1.5.20.tar.gz 4b64296ea0eeccdee9168c035e0488ab memcached-1.5.20.tar.gz Size: 531035 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/memcached] - updated to 1.5.20
commit 42a6147cde6e36b3f340e8e6be0ce568cf3dc98a Author: Sławomir Paszkiewicz Date: Tue Nov 12 15:55:08 2019 +0100 - updated to 1.5.20 memcached.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/memcached.spec b/memcached.spec index 65ebe81..126c004 100644 --- a/memcached.spec +++ b/memcached.spec @@ -11,12 +11,12 @@ Summary: A high-performance, distributed memory object caching system Summary(pl.UTF-8): Rozproszony, wysokiej wydajności system cache'owania obiektów Name: memcached -Version: 1.5.19 +Version: 1.5.20 Release: 1 License: BSD Group: Networking/Daemons Source0: http://www.memcached.org/files/%{name}-%{version}.tar.gz -# Source0-md5: 60d6a6da08edad8b06945e75fbf28249 +# Source0-md5: 4b64296ea0eeccdee9168c035e0488ab Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.tmpfiles gitweb: http://git.pld-linux.org/gitweb.cgi/packages/memcached.git/commitdiff/42a6147cde6e36b3f340e8e6be0ce568cf3dc98a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: radvd: radvd-2.18.tar.gz
Request by: paszczus Files fetched: 1 STORED: http://v6web.litech.org/radvd/dist/radvd-2.18.tar.gz 26ead3a0d5cfbe4c81c3089eaf7b3250 radvd-2.18.tar.gz Size: 224183 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/radvd] - updated to 2.18
commit b51447d7358635beda6c0f558ad9c59afe2696e5 Author: Sławomir Paszkiewicz Date: Tue Nov 12 15:52:42 2019 +0100 - updated to 2.18 radvd.spec | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) --- diff --git a/radvd.spec b/radvd.spec index afeb4e9..c11033b 100644 --- a/radvd.spec +++ b/radvd.spec @@ -1,12 +1,12 @@ Summary: Router Advertisement Daemon Summary(pl.UTF-8): Demon ogłaszania routerów Name: radvd -Version: 2.17 +Version: 2.18 Release: 1 License: GPL Group: Networking Source0: http://v6web.litech.org/radvd/dist/%{name}-%{version}.tar.gz -# Source0-md5: 64ee3fdb5544bcddef1c6cd80d77fa0a +# Source0-md5: 26ead3a0d5cfbe4c81c3089eaf7b3250 Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.tmpfiles @@ -98,8 +98,9 @@ chmod 0644 /etc/radvd.conf %defattr(644,root,root,755) %doc README TODO CHANGES* INTRO.html %attr(754,root,root) /etc/rc.d/init.d/radvd -/usr/lib/tmpfiles.d/%{name}.conf +%{systemdtmpfilesdir}/%{name}.conf +%{systemdunitdir}/radvd.service %attr(755,radvd,root) %dir /var/run/radvd -%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/radvd.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/radvd.conf %attr(755,root,root) %{_sbindir}/* %{_mandir}/man*/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/radvd.git/commitdiff/b51447d7358635beda6c0f558ad9c59afe2696e5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Config-Grammar] - initial
commit 4eefa5db9c7ecea565c7edb8f1f4759201b46628 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Aug 20 11:15:37 2015 +0200 - initial perl-Config-Grammar.spec | 78 1 file changed, 78 insertions(+) --- diff --git a/perl-Config-Grammar.spec b/perl-Config-Grammar.spec new file mode 100644 index 000..61fd71a --- /dev/null +++ b/perl-Config-Grammar.spec @@ -0,0 +1,78 @@ +# +# Conditional build: +%bcond_without tests # do not perform make test +# +%definepdirConfig +%definepnamGrammar +%include /usr/lib/rpm/macros.perl +Summary: Config::Grammar - A grammar-based, user-friendly config parser +Name: perl-Config-Grammar +Version: 1.10 +Release: 1 +License: GPL v1+ or Artistic +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/Config/%{pdir}-%{pnam}-%{version}.tar.gz +# Source0-md5: ce904f687f1ee9c70521142a2e0f15c9 +URL: http://search.cpan.org/dist/Config-Grammar/ +BuildRequires: perl-devel = 1:5.8.0 +BuildRequires: rpm-perlprov = 4.1-13 +%if %{with tests} +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Config::Grammar is a module to parse configuration files. The +configuration may consist of multiple-level sections with assignments +and tabular data. The parsed data will be returned as a hash +containing the whole configuration. Config::Grammar uses a grammar +that is supplied upon creation of a Config::Grammar object to parse +the configuration file and return helpful error messages in case of +syntax errors. Using the makepod method you can generate documentation +of the configuration file format. + +The maketmpl method can generate a template configuration file. If +your grammar contains regexp matches, the template will not be all +that helpful as Config::Grammar is not smart enough to give you +sensible template data based in regular expressions. The related +function maketmplmin generates a minimal configuration template +without examples, regexps or comments and thus allows an experienced +user to fill in the configuration data more efficiently. + + +The grammar is a multiple-level hash of hashes, which follows the +structure of the configuration. Each section or variable is +represented by a hash with the same structure. Each hash contains +special keys starting with an underscore such as '_sections', '_vars', +'_sub' or '_re' to denote meta data with information about that +section or variable. Other keys are used to structure the hash +according to the same nesting structure of the configuration itself. +The starting hash given as parameter to 'new' contains the root +section. + + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} pure_install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/Config/*.pm +%{perl_vendorlib}/Config/Grammar +%{_mandir}/man3/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-Config-Grammar.git/commitdiff/4eefa5db9c7ecea565c7edb8f1f4759201b46628 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Config-Grammar] Created branch master
The branch 'master' was created. Summary of new commits: 4eefa5d... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-Net-OpenSSH: Net-OpenSSH-0.65_05.tar.gz
Request by: paszczus Files fetched: 1 STORED: http://www.cpan.org/modules/by-authors/id/S/SA/SALVA/Net-OpenSSH-0.65_05.tar.gz beef8cd48d10e12fc19a2ef836f754a6 Net-OpenSSH-0.65_05.tar.gz Size: 71030 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: perl-Config-Grammar: Config-Grammar-1.10.tar.gz
Request by: paszczus Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/Config/Config-Grammar-1.10.tar.gz ce904f687f1ee9c70521142a2e0f15c9 Config-Grammar-1.10.tar.gz Size: 17877 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: perl-IO-Tty: IO-Tty-1.12.tar.gz
Request by: paszczus Files fetched: 1 STORED: http://www.cpan.org/modules/by-authors/id/T/TO/TODDR/IO-Tty-1.12.tar.gz 11695a1a516b3bd1b90ce75ff0ce3e6d IO-Tty-1.12.tar.gz Size: 24564 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Net-OpenSSH] - initial
commit 1755ac12604932221868e2eec31b8a4877472344 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Aug 20 11:22:21 2015 +0200 - initial perl-Net-OpenSSH.spec | 69 +++ 1 file changed, 69 insertions(+) --- diff --git a/perl-Net-OpenSSH.spec b/perl-Net-OpenSSH.spec new file mode 100644 index 000..71d88e8 --- /dev/null +++ b/perl-Net-OpenSSH.spec @@ -0,0 +1,69 @@ +# +# Conditional build: +%bcond_without tests # do not perform make test +# +%definepdirNet +%definepnamOpenSSH +%include /usr/lib/rpm/macros.perl +Summary: Net::OpenSSH - Perl SSH client package implemented on top of OpenSSH +Name: perl-Net-OpenSSH +Version: 0.65_05 +Release: 1 +License: unknown +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-authors/id/S/SA/SALVA/Net-OpenSSH-0.65_05.tar.gz +# Source0-md5: beef8cd48d10e12fc19a2ef836f754a6 +URL: http://search.cpan.org/dist/Net-OpenSSH/ +BuildRequires: perl-devel = 1:5.8.0 +BuildRequires: rpm-perlprov = 4.1-13 +%if %{with tests} +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Net::OpenSSH is a secure shell client package implemented on top of +OpenSSH binary client (ssh). + +This package is implemented around the multiplexing feature found in +later versions of OpenSSH. That feature allows one to run several +sessions over a single SSH connection (OpenSSH 4.1 was the first +one to provide all the required functionality). + +When a new Net::OpenSSH object is created, the OpenSSH ssh client +is run in master mode, establishing a persistent (for the lifetime of +the object) connection to the server. + +Then, every time a new operation is requested a new ssh process is +started in slave mode, effectively reusing the master SSH connection +to send the request to the remote side. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} pure_install \ + DESTDIR=$RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cp -a sample $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/Net/*.pm +%{perl_vendorlib}/Net/OpenSSH +%{_mandir}/man3/* +%{_examplesdir}/%{name}-%{version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-Net-OpenSSH.git/commitdiff/1755ac12604932221868e2eec31b8a4877472344 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Net-OpenSSH] Created branch master
The branch 'master' was created. Summary of new commits: 1755ac1... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-IO-Tty] - updated to 1.12
commit 8b36957a3d1961535f7947026da2995898e94ad7 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Aug 20 11:30:38 2015 +0200 - updated to 1.12 perl-IO-Tty.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/perl-IO-Tty.spec b/perl-IO-Tty.spec index 682204b..a44acf4 100644 --- a/perl-IO-Tty.spec +++ b/perl-IO-Tty.spec @@ -8,13 +8,13 @@ Summary: IO::Tty and IO::Pty - interface to pseudo-ttys Summary(pl.UTF-8): IO::Tty i IO::Pty - interfejs do pseudo-tty Name: perl-IO-Tty -Version: 1.10 -Release: 5 +Version: 1.12 +Release: 1 # same as perl License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-authors/id/T/TO/TODDR/%{pdir}-%{pnam}-%{version}.tar.gz -# Source0-md5: 46baec86a145e57f0ec661fa412b097c +# Source0-md5: 11695a1a516b3bd1b90ce75ff0ce3e6d URL: http://search.cpan.org/dist/IO-Tty/ BuildRequires: perl-devel = 1:5.8.0 BuildRequires: rpm-perlprov = 4.1-13 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-IO-Tty.git/commitdiff/8b36957a3d1961535f7947026da2995898e94ad7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/freeradius-server] - updated to 2.2.7
commit 6bb16440ca65f052a748305da6cd789c82c4586e Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu May 21 14:53:50 2015 +0200 - updated to 2.2.7 freeradius-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/freeradius-server.spec b/freeradius-server.spec index dbff3b9..e9a215d 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -16,12 +16,12 @@ Summary: High-performance and highly configurable RADIUS server Summary(pl.UTF-8): Szybki i wysoce konfigurowalny serwer RADIUS Name: freeradius-server -Version: 2.2.6 +Version: 2.2.7 Release: 1 License: GPL Group: Networking/Daemons/Radius Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2 -# Source0-md5: e9a6f9bbee9706b008b924061ab3f915 +# Source0-md5: b84b9ffa1ac9b20b2643e5a08ac483a1 Source1: %{name}.logrotate Source2: %{name}.init Source3: %{name}.pam gitweb: http://git.pld-linux.org/gitweb.cgi/packages/freeradius-server.git/commitdiff/6bb16440ca65f052a748305da6cd789c82c4586e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: freeradius-server: freeradius-server-2.2.7.tar.bz2
Request by: paszczus Files fetched: 1 STORED: ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.2.7.tar.bz2 b84b9ffa1ac9b20b2643e5a08ac483a1 freeradius-server-2.2.7.tar.bz2 Size: 2791603 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/freeradius-server] - bumped release to rebuild with new openssl
commit 6d788e289b91dc5b7eb7993230c9ea08c9d0e877 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Feb 5 00:50:20 2015 +0100 - bumped release to rebuild with new openssl freeradius-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/freeradius-server.spec b/freeradius-server.spec index 054335d..13f9231 100644 --- a/freeradius-server.spec +++ b/freeradius-server.spec @@ -17,7 +17,7 @@ Summary: High-performance and highly configurable RADIUS server Summary(pl.UTF-8): Szybki i wysoce konfigurowalny serwer RADIUS Name: freeradius-server Version: 2.2.5 -Release: 3 +Release: 4 License: GPL Group: Networking/Daemons/Radius Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/freeradius-server.git/commitdiff/6d788e289b91dc5b7eb7993230c9ea08c9d0e877 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - updated t o 0.99.23 - removed quagga-blackhole.patch as seems to be applied upstream
commit 392ebbfc9f9248b3b76d1caf9a1389ad75ac38fc Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Aug 14 09:14:51 2014 +0200 - updated t o 0.99.23 - removed quagga-blackhole.patch as seems to be applied upstream quagga.spec | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) --- diff --git a/quagga.spec b/quagga.spec index e77802f..a336460 100644 --- a/quagga.spec +++ b/quagga.spec @@ -1,12 +1,12 @@ Summary: Routing Software Suite Summary(pl.UTF-8): Zestaw oprogramowania do routingu Name: quagga -Version: 0.99.22.4 +Version: 0.99.23 Release: 1 License: GPL v2+ Group: Networking/Daemons -Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz -# Source0-md5: 27ef98abb1820bae19eb71f631a10853 +Source0: http://download.savannah.gnu.org/releases/quagga/%{name}-%{version}.tar.xz +# Source0-md5: 92dff03272aa9127ac13c6bea9c66187 Source1: %{name}.pam Source2: %{name}.tmpfiles Source10: %{name}-zebra.init @@ -37,7 +37,6 @@ Patch0: %{name}-info.patch Patch1:%{name}-proc.patch Patch2:%{name}-vtysh-pam.patch Patch3:%{name}-readline.patch -Patch4:%{name}-blackhole.patch URL: http://www.quagga.net/ BuildRequires: autoconf = 2.53 BuildRequires: automake @@ -217,7 +216,6 @@ Statyczne wersje bibliotek quagga. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build %{__libtoolize} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/392ebbfc9f9248b3b76d1caf9a1389ad75ac38fc ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: quagga: quagga-0.99.23.tar.xz
Files fetched: 1 STORED: http://download.savannah.gnu.org/releases/quagga/quagga-0.99.23.tar.xz 92dff03272aa9127ac13c6bea9c66187 quagga-0.99.23.tar.xz Size: 1689756 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pastebinit] - updated to 1.4.1
commit 58ebe415a97c20ee05ddb7052ebc5e1a56fc4f0c Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Aug 11 21:33:12 2014 +0200 - updated to 1.4.1 pastebinit.spec | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) --- diff --git a/pastebinit.spec b/pastebinit.spec index acb591d..b8c80e6 100644 --- a/pastebinit.spec +++ b/pastebinit.spec @@ -1,12 +1,12 @@ Summary: Command line Pastebin Summary(pl.UTF-8): Pastebin działający z linii poleceń Name: pastebinit -Version: 1.3.1 -Release: 2 +Version: 1.4.1 +Release: 1 License: GPL v2+ Group: Applications Source0: http://launchpad.net/pastebinit/trunk/%{version}/+download/%{name}-%{version}.tar.gz -# Source0-md5: ebe0f8f118519d3505eabe0f48a10ad5 +# Source0-md5: cfa3337ee9acb1f0b02e952b879f63a7 Patch0:env-pastebin.patch URL: https://launchpad.net/pastebinit BuildRequires: gettext-devel @@ -32,7 +32,6 @@ standardowego wyjścia, a on przeklei informacje na Pastebin. %patch0 -p1 %{__sed} -i -e '1s,^#!.*python,#!%{__python},' pastebinit -%{__sed} -i -e 's#http://pastebin.com#http://pld.pastebin.com#g' pastebinit %build %{__make} -C po gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pastebinit.git/commitdiff/58ebe415a97c20ee05ddb7052ebc5e1a56fc4f0c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: pastebinit: pastebinit-1.4.1.tar.gz
Files fetched: 1 STORED: http://launchpad.net/pastebinit/trunk/1.4.1/+download/pastebinit-1.4.1.tar.gz cfa3337ee9acb1f0b02e952b879f63a7 pastebinit-1.4.1.tar.gz Size: 43740 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - added sysconfig
commit 8dfe57a76401b08765ab069f6283ba488c02a416 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Aug 1 14:56:43 2014 +0200 - added sysconfig accel-ppp.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/accel-ppp.spec b/accel-ppp.spec index 78438b9..4c2a5d6 100644 --- a/accel-ppp.spec +++ b/accel-ppp.spec @@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/accel-ppp/%{name}-%{version}.tar.bz2 Source1: %{name}.tmpfiles Source2: %{name}.init Source3: %{name}.logrotate +Source4: %{name}.sysconfig BuildRequires: cmake = 2.6 BuildRequires: libnl1-devel BuildRequires: net-snmp-devel = 5.0 @@ -65,6 +66,7 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} $RPM_BUILD_RO cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/accel-pppd cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} +install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/accel-ppp %clean rm -rf $RPM_BUILD_ROOT @@ -75,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir} %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/accel-ppp.conf.dist %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name} %attr(755,root,root) %{_bindir}/accel-cmd %attr(755,root,root) %{_sbindir}/accel-pppd %attr(755,root,root) %{_libdir}/accel-ppp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accel-ppp.git/commitdiff/8dfe57a76401b08765ab069f6283ba488c02a416 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - updated description
commit 2be4adcda03bcb1e60f99acbc5fa70636b6ceca4 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Aug 1 14:59:20 2014 +0200 - updated description accel-ppp.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/accel-ppp.spec b/accel-ppp.spec index 4c2a5d6..1f11a7d 100644 --- a/accel-ppp.spec +++ b/accel-ppp.spec @@ -37,10 +37,11 @@ Features: - PPPoE server - L2TPv2 server - Radius CoA/DM(PoD) -- Built-in shaper (tbf) -- Command line interface (telnet) +- Built-in shaper +- Command line interface - SNMP - IPv6 (including builtin Neighbor Discovery and DHCPv6) +- IPoE (start session by DHCPv4 or unclassified IPv4 packet) %prep %setup -q gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accel-ppp.git/commitdiff/2be4adcda03bcb1e60f99acbc5fa70636b6ceca4 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - updated to 1.8.0
commit cad42b83042e07e245de037e302d6ed769591192 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jul 9 15:42:42 2014 +0200 - updated to 1.8.0 accel-ppp.spec | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) --- diff --git a/accel-ppp.spec b/accel-ppp.spec index 93b895e..b5e7150 100644 --- a/accel-ppp.spec +++ b/accel-ppp.spec @@ -6,18 +6,16 @@ # Summary: High performance PPTP/L2TP/PPPoE server Name: accel-ppp -Version: 1.7.3 -Release: 0.1 +Version: 1.8.0 +Release: 1 License: GPL v2+ Group: Networking -URL: http://sourceforge.net/projects/accel-ppp/ +URL: http://sourceforge.net/projects/accel-ppp Source0: http://downloads.sourceforge.net/accel-ppp/%{name}-%{version}.tar.bz2 -# Source0-md5: bf03f20d9df9a0694e5cd0be9b57d1b6 +# Source0-md5: bc3a02b24fb9f304f7417a9011a494d6 Source1: %{name}.tmpfiles Source2: %{name}.init Source3: %{name}.logrotate -Patch0:%{name}-cmake.patch -Patch1:%{name}-cmake-lib64.patch BuildRequires: cmake = 2.6 BuildRequires: libnl1-devel BuildRequires: net-snmp-devel = 5.0 @@ -45,10 +43,6 @@ Features: %prep %setup -q -%patch0 -p1 -%ifarch %{x8664} -%patch1 -p1 -%endif %build install -d build @@ -71,7 +65,7 @@ install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} $RPM_BUILD_RO cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/accel-pppd cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -echo 0 $RPM_BUILD_ROOT/var/run/accel-ppp/seq +install -d $RPM_BUILD_ROOT/var/log/accel-ppp %clean rm -rf $RPM_BUILD_ROOT @@ -82,13 +76,13 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir} %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/accel-ppp.conf.dist %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} +%attr(755,root,root) %{_bindir}/accel-cmd %attr(755,root,root) %{_sbindir}/accel-pppd %attr(755,root,root) %{_libdir}/accel-ppp %attr(754,root,root) /etc/rc.d/init.d/accel-pppd %dir /var/run/%{name} -# XXX do you really want to overwrite this? -/var/run/%{name}/seq %{systemdtmpfilesdir}/%{name}.conf %{_datadir}/%{name} +%{_mandir}/man1/accel-cmd.* %{_mandir}/man5/accel-ppp.conf.5* %dir /var/log/accel-ppp gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accel-ppp.git/commitdiff/d7efa0cf7f6ecba678dd8b0f83281c2df2f53bfe ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - seems to be not needed anymore
commit d7efa0cf7f6ecba678dd8b0f83281c2df2f53bfe Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jul 9 15:43:17 2014 +0200 - seems to be not needed anymore accel-ppp-cmake-lib64.patch | 184 accel-ppp-cmake.patch | 15 2 files changed, 199 deletions(-) --- diff --git a/accel-ppp-cmake-lib64.patch b/accel-ppp-cmake-lib64.patch deleted file mode 100644 index 75ef136..000 --- a/accel-ppp-cmake-lib64.patch +++ /dev/null @@ -1,184 +0,0 @@ accel-ppp-1.6.1/accel-pppd/auth/CMakeLists.txt 2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/auth/CMakeLists.txt 2012-04-17 15:08:00.634062871 +0200 -@@ -8,6 +8,6 @@ - TARGET_LINK_LIBRARIES(auth_mschap_v2 ${crypto_lib}) - - INSTALL(TARGETS auth_pap auth_chap_md5 auth_mschap_v1 auth_mschap_v2 -- LIBRARY DESTINATION lib/accel-ppp -+ LIBRARY DESTINATION lib64/accel-ppp - ) - -Tylko w accel-ppp-1.6.1.new/accel-pppd/auth: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/CMakeLists.txt 2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/CMakeLists.txt 2012-04-17 15:44:24.036866845 +0200 -@@ -80,7 +80,7 @@ - set_property(TARGET accel-pppd PROPERTY CMAKE_SKIP_BUILD_RPATH FALSE) - set_property(TARGET accel-pppd PROPERTY CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE) --set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp) -+set_property(TARGET accel-pppd PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib64/accel-ppp) - - INSTALL(TARGETS accel-pppd - RUNTIME DESTINATION sbin -Tylko w accel-ppp-1.6.1.new/accel-pppd: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/ctrl/l2tp/CMakeLists.txt2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/ctrl/l2tp/CMakeLists.txt2012-04-17 15:08:47.786295511 +0200 -@@ -10,7 +10,7 @@ - ) - #TARGET_LINK_LIBRARIES(l2tp nl nl-genl) - --INSTALL(TARGETS l2tp LIBRARY DESTINATION lib/accel-ppp) -+INSTALL(TARGETS l2tp LIBRARY DESTINATION lib64/accel-ppp) - - FILE(GLOB dict ${CMAKE_CURRENT_SOURCE_DIR}/dict/*) - INSTALL(FILES ${dict} DESTINATION share/accel-ppp/l2tp) -Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/l2tp: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/ctrl/pppoe/CMakeLists.txt 2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/ctrl/pppoe/CMakeLists.txt 2012-04-17 15:09:26.651469094 +0200 -@@ -18,4 +18,4 @@ - #set_property(TARGET pppoe PROPERTY INSTALL_RPATH_USE_LINK_PATH FALSE) - #set_property(TARGET pppoe PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib/accel-ppp) - --INSTALL(TARGETS pppoe LIBRARY DESTINATION lib/accel-ppp) -+INSTALL(TARGETS pppoe LIBRARY DESTINATION lib64/accel-ppp) -Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/pppoe: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/ctrl/pptp/CMakeLists.txt2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/ctrl/pptp/CMakeLists.txt2012-04-17 15:09:40.922144806 +0200 -@@ -2,4 +2,4 @@ - - ADD_LIBRARY(pptp SHARED pptp.c) - --INSTALL(TARGETS pptp LIBRARY DESTINATION lib/accel-ppp ) -+INSTALL(TARGETS pptp LIBRARY DESTINATION lib64/accel-ppp ) -Tylko w accel-ppp-1.6.1.new/accel-pppd/ctrl/pptp: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/extra/CMakeLists.txt2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/extra/CMakeLists.txt2012-04-17 15:10:01.156436224 +0200 -@@ -8,7 +8,7 @@ - ADD_LIBRARY(connlimit SHARED connlimit.c) - - INSTALL(TARGETS pppd_compat ippool ipv6pool sigchld chap-secrets logwtmp connlimit -- LIBRARY DESTINATION lib/accel-ppp -+ LIBRARY DESTINATION lib64/accel-ppp - ) - - IF (SHAPER) -@@ -18,7 +18,7 @@ - SET_PROPERTY(TARGET shaper_tbf PROPERTY LINK_FLAGS -L${LIBNL_PREFIX}/lib) - ENDIF (LIBNL_PREFIX) - TARGET_LINK_LIBRARIES(shaper_tbf nl m) -- INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib/accel-ppp) -+ INSTALL(TARGETS shaper_tbf LIBRARY DESTINATION lib64/accel-ppp) - ENDIF (SHAPER) - - -Tylko w accel-ppp-1.6.1.new/accel-pppd/extra: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/extra/net-snmp/CMakeLists.txt 2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/extra/net-snmp/CMakeLists.txt 2012-04-17 15:10:16.977185330 +0200 -@@ -25,5 +25,5 @@ - ENDIF (NETSNMP_PREFIX) - - INSTALL(TARGETS net-snmp -- LIBRARY DESTINATION lib/accel-ppp -+ LIBRARY DESTINATION lib64/accel-ppp - ) -Tylko w accel-ppp-1.6.1.new/accel-pppd/extra/net-snmp: CMakeLists.txt~ accel-ppp-1.6.1/accel-pppd/ipv6/CMakeLists.txt 2012-03-20 06:43:40.0 +0100 -+++ accel-ppp-1.6.1.new/accel-pppd/ipv6/CMakeLists.txt 2012-04-17 15:10:28.44083 +0200 -@@ -2,6 +2,6 @@ - ADD_LIBRARY(ipv6_nd SHARED nd.c) - - INSTALL(TARGETS ipv6_dhcp ipv6_nd -- LIBRARY DESTINATION lib/accel-ppp -+ LIBRARY DESTINATION
DISTFILES: accel-ppp: accel-ppp-1.8.0.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/accel-ppp/accel-ppp-1.8.0.tar.bz2 bc3a02b24fb9f304f7417a9011a494d6 accel-ppp-1.8.0.tar.bz2 Size: 1566401 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - small fixes
commit e9d40f137dda7763fdcdeefcdd4e0a910e5e4b24 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jul 9 16:08:02 2014 +0200 - small fixes accel-ppp.spec | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) --- diff --git a/accel-ppp.spec b/accel-ppp.spec index b5e7150..78438b9 100644 --- a/accel-ppp.spec +++ b/accel-ppp.spec @@ -51,9 +51,9 @@ cd build -DSHAPER=TRUE \ -DRADIUS=TRUE \ -DNETSNMP=TRUE \ - -DBUILD_INSTALL_PREFIX=$RPM_BUILD_ROOT \ -DLOG_PGSQL=FALSE \ .. + %{__make} %install @@ -61,11 +61,10 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C build install/fast \ DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} $RPM_BUILD_ROOT%{systemdtmpfilesdir} +install -d $RPM_BUILD_ROOT/etc/{sysconfig,logrotate.d,rc.d/init.d} $RPM_BUILD_ROOT%{systemdtmpfilesdir} $RPM_BUILD_ROOT/var/log/accel-ppp cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/accel-pppd cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/%{name} -install -d $RPM_BUILD_ROOT/var/log/accel-ppp %clean rm -rf $RPM_BUILD_ROOT @@ -74,13 +73,12 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc README %dir %{_sysconfdir} -%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/accel-ppp.conf.dist +%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/accel-ppp.conf.dist %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(755,root,root) %{_bindir}/accel-cmd %attr(755,root,root) %{_sbindir}/accel-pppd %attr(755,root,root) %{_libdir}/accel-ppp %attr(754,root,root) /etc/rc.d/init.d/accel-pppd -%dir /var/run/%{name} %{systemdtmpfilesdir}/%{name}.conf %{_datadir}/%{name} %{_mandir}/man1/accel-cmd.* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accel-ppp.git/commitdiff/e9d40f137dda7763fdcdeefcdd4e0a910e5e4b24 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - updated to 3.3.7
commit ef52c54e9c91a874eb8a0d7a48a76d831eca144d Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed May 14 14:10:35 2014 +0200 - updated to 3.3.7 otrs.spec | 35 +-- 1 file changed, 33 insertions(+), 2 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index 4851862..a8d6d86 100644 --- a/otrs.spec +++ b/otrs.spec @@ -7,13 +7,13 @@ Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs -Version: 3.3.5 +Version: 3.3.7 Release: 0.1 Epoch: 1 License: GPL Group: Applications/Databases Source0: http://ftp.otrs.org/pub/otrs/%{name}-%{version}.tar.bz2 -# Source0-md5: 1bd5a0a8fac9a2348c668cbb485d666e +# Source0-md5: c8f70e564d4ddd73394232ca2e392c21 Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch @@ -307,6 +307,8 @@ fi %dir %{otrsdir}/Kernel/System/LinkObject %dir %{otrsdir}/Kernel/System/Log %dir %{otrsdir}/Kernel/System/MailAccount +%dir %{otrsdir}/Kernel/System/Package +%dir %{otrsdir}/Kernel/System/Package/Event %dir %{otrsdir}/Kernel/System/PostMaster %dir %{otrsdir}/Kernel/System/PostMaster/LoopProtection %dir %{otrsdir}/Kernel/System/PostMaster/Filter @@ -323,6 +325,30 @@ fi %dir %{otrsdir}/Kernel/System/Stats %dir %{otrsdir}/Kernel/System/Stats/Static %dir %{otrsdir}/Kernel/System/Stats/Dynamic +%dir %{otrsdir}/Kernel/System/SupportDataCollector +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/mssql +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/mssql/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/mysql +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/mysql/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/oracle +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/oracle/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/postgresql +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Database/postgresql/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OS +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OS/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OTRS +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OTRS/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OTRS/Ticket +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/OTRS/Ticket/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver/Apache +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver/Apache/*.pm +%dir %{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver/IIS +%{otrsdir}/Kernel/System/SupportDataCollector/Plugin/Webserver/IIS/*.pm %dir %{otrsdir}/Kernel/System/SysConfig %dir %{otrsdir}/Kernel/System/Ticket %dir %{otrsdir}/Kernel/System/Ticket/Acl @@ -343,6 +369,8 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/Algorithm %dir %{otrsdir}/Kernel/cpan-lib/Apache %dir %{otrsdir}/Kernel/cpan-lib/Apache2 +%dir %{otrsdir}/Kernel/cpan-lib/Archive +%dir %{otrsdir}/Kernel/cpan-lib/Archive/Tar %dir %{otrsdir}/Kernel/cpan-lib/CGI %dir %{otrsdir}/Kernel/cpan-lib/CGI/Emulate %dir %{otrsdir}/Kernel/cpan-lib/CGI/Parse @@ -376,6 +404,8 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/Net/SSLGlue %dir %{otrsdir}/Kernel/cpan-lib/Proc %{otrsdir}/Kernel/cpan-lib/Proc/Daemon.pod +%dir %{otrsdir}/Kernel/cpan-lib/Selenium +%dir %{otrsdir}/Kernel/cpan-lib/Selenium/Remote %dir %{otrsdir}/Kernel/cpan-lib/SOAP %dir %{otrsdir}/Kernel/cpan-lib/SOAP/Lite %dir %{otrsdir}/Kernel/cpan-lib/SOAP/Lite/Deserializer @@ -397,6 +427,7 @@ fi %attr(700,otrs,root) %{otrsdir}/bin/otrs.* %dir %{otrsdir}/bin/cgi-bin/ %attr(750,root,http) %{otrsdir}/bin/cgi-bin/*.pl +%attr(750,root,http) %{otrsdir}/bin/cgi-bin/app.psgi %dir %{otrsdir}/bin/fcgi-bin/ %attr(750,root,http) %{otrsdir}/bin/fcgi-bin/*.pl %dir %{otrsdir}/scripts gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/ef52c54e9c91a874eb8a0d7a48a76d831eca144d ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: otrs: otrs-3.3.7.tar.bz2
Files fetched: 1 STORED: http://ftp.otrs.org/pub/otrs/otrs-3.3.7.tar.bz2 c8f70e564d4ddd73394232ca2e392c21 otrs-3.3.7.tar.bz2 Size: 20310945 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - adaptarization fixes
commit 1629f6f8e4d5c1eeb3dbeff4c626edb42d0cb72f Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon May 5 08:58:32 2014 +0200 - adaptarization fixes quagga.spec | 58 +- 1 file changed, 29 insertions(+), 29 deletions(-) --- diff --git a/quagga.spec b/quagga.spec index e881ca4..e77802f 100644 --- a/quagga.spec +++ b/quagga.spec @@ -257,35 +257,35 @@ install -d $RPM_BUILD_ROOT/etc/{env.d,logrotate.d,pam.d,rc.d/init.d,sysconfig} \ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra -install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf - -install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra -install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd -install %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d -install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd -install %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd -install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd -install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd -install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld - -install %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra -install %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd -install %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d -install %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd -install %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd -install %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd -install %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd -install %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld - -install %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra -install %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd -install %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd -install %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d -install %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd -install %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd -install %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd -install %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld +cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + +install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra +install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd +install -p %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d +install -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd +install -p %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd +install -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd +install -p %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd +install -p %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld + +cp -p %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra +cp -p %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd +cp -p %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d +cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd +cp -p %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd +cp -p %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd +cp -p %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd +cp -p %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld + +cp -p %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra +cp -p %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd +cp -p %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd +cp -p %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d +cp -p %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd +cp -p %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd +cp -p %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd +cp -p %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld touch $RPM_BUILD_ROOT/var/log/%{name}/{zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.log gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/1629f6f8e4d5c1eeb3dbeff4c626edb42d0cb72f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] updated for 0.99.22.4
commit f92f7747d5c2b654b0f4961f0265d20491cc4849 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 16:59:23 2014 +0200 updated for 0.99.22.4 quagga-proc.patch | 22 +++--- 1 file changed, 15 insertions(+), 7 deletions(-) --- diff --git a/quagga-proc.patch b/quagga-proc.patch index 833e3b4..61e8588 100644 --- a/quagga-proc.patch +++ b/quagga-proc.patch @@ -1,6 +1,6 @@ quagga-0.99.13/configure.ac.orig 2009-07-11 19:57:36.0 +0200 -+++ quagga-0.99.13/configure.ac2009-07-11 20:03:30.0 +0200 -@@ -951,37 +951,15 @@ +--- quagga-0.99.22.4/configure.ac 2013-09-04 21:25:43.0 +0200 quagga-0.99.22.4.new/configure.ac 2014-05-02 18:39:27.281182113 +0200 +@@ -1050,45 +1050,15 @@ dnl --- dnl check proc file system. dnl --- @@ -20,10 +20,18 @@ dnl check ipforward detect method dnl - -AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method], --[for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; --do -- test x`ls $quagga_cv_ipforward_method 2/dev/null` = x$quagga_cv_ipforward_method break --done +-[if test x$cross_compiling = xyes; then +- if test x$opsys = xgnu-linux; then +-quagga_cv_ipforward_method=/proc/net/snmp +- else +-quagga_cv_ipforward_method=/dev/ip +- fi +-else +- for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null; +- do +-test x`ls $quagga_cv_ipforward_method 2/dev/null` = x$quagga_cv_ipforward_method break +- done +-fi -case $quagga_cv_ipforward_method in - /proc/net/snmp) quagga_cv_ipforward_method=proc;; - /dev/ip) gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/7f780b21db9eb39908f4cc3f997d0396cece2914 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - updated to 0.99.22.4 - added BABEL wireless mesh routing - removed obsolete patches - packaged osp
commit 7f780b21db9eb39908f4cc3f997d0396cece2914 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 17:01:42 2014 +0200 - updated to 0.99.22.4 - added BABEL wireless mesh routing - removed obsolete patches - packaged ospfclient quagga.spec | 59 +-- 1 file changed, 49 insertions(+), 10 deletions(-) --- diff --git a/quagga.spec b/quagga.spec index b1ebfc7..034c199 100644 --- a/quagga.spec +++ b/quagga.spec @@ -1,12 +1,12 @@ Summary: Routing Software Suite Summary(pl.UTF-8): Zestaw oprogramowania do routingu Name: quagga -Version: 0.99.20.1 +Version: 0.99.22.4 Release: 1 License: GPL v2+ Group: Networking/Daemons Source0: http://www.quagga.net/download/%{name}-%{version}.tar.gz -# Source0-md5: 270ddd464407f8ce6fa8ada8bc1abbd7 +# Source0-md5: 27ef98abb1820bae19eb71f631a10853 Source1: %{name}.pam Source2: %{name}.tmpfiles Source10: %{name}-zebra.init @@ -16,6 +16,7 @@ Source13: %{name}-ospfd.init Source14: %{name}-ripd.init Source15: %{name}-ripngd.init Source16: %{name}-isisd.init +Source17: %{name}-babeld.init Source20: %{name}-zebra.sysconfig Source21: %{name}-bgpd.sysconfig Source22: %{name}-ospf6d.sysconfig @@ -23,6 +24,7 @@ Source23: %{name}-ospfd.sysconfig Source24: %{name}-ripd.sysconfig Source25: %{name}-ripngd.sysconfig Source26: %{name}-isisd.sysconfig +Source27: %{name}-babeld.sysconfig Source30: %{name}-zebra.logrotate Source31: %{name}-bgpd.logrotate Source32: %{name}-ospfd.logrotate @@ -30,13 +32,12 @@ Source33: %{name}-ospf6d.logrotate Source34: %{name}-ripd.logrotate Source35: %{name}-ripngd.logrotate Source36: %{name}-isisd.logrotate +Source37: %{name}-babeld.logrotate Patch0:%{name}-info.patch Patch1:%{name}-proc.patch Patch2:%{name}-vtysh-pam.patch -Patch3:%{name}-link.patch -Patch4:%{name}-readline.patch -Patch5:%{name}-fix-ipremove.patch -Patch6:%{name}-blackhole.patch +Patch3:%{name}-readline.patch +Patch4:%{name}-blackhole.patch URL: http://www.quagga.net/ BuildRequires: autoconf = 2.53 BuildRequires: automake @@ -95,6 +96,19 @@ rozwijany przez Kunihiro Ishiguro. Celem drzewa Quagga jest zgromadzenie bardziej zaangażowanej społeczności wokół projektu, niż w aktualnie scentralizowanym modelu GNU Zebry. +%package babeld +Summary:BABEL wireless mesh routing daemon +Summary(pl.UTF-8): Demon routingu BABEL +Group: Networking/Daemons +Requires(post,preun): /sbin/chkconfig +Requires: %{name} = %{version}-%{release} + +%description babeld +BABEL wireless mesh routing daemon. Includes IPv6 support. + +%description babeld -l pl.UTF-8 +Demon obsługi protokołu BABEL. Obsługuje także IPv6. + %package bgpd Summary: BGP routing daemon Summary(pl.UTF-8): Demon routingu BGP @@ -204,8 +218,6 @@ Statyczne wersje bibliotek quagga. %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build %{__libtoolize} @@ -255,6 +267,7 @@ install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd install %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd +install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld install %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra install %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd @@ -263,6 +276,7 @@ install %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd install %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd install %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd install %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd +install %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld install %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra install %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd @@ -271,10 +285,11 @@ install %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d install %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd install %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd install %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd +install %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld -touch $RPM_BUILD_ROOT/var/log/%{name}/{zebra,bgpd,ospf6d,ospfd,ripd,ripngd,isisd}.log +touch $RPM_BUILD_ROOT/var/log/%{name}/{zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.log -touch $RPM_BUILD_ROOT%{_sysconfdir}/{vtysh,zebra,bgpd,ospf6d,ospfd,ripd,ripngd,isisd}.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/{vtysh,zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.conf echo '#VTYSH_PAGER=less -FX' $RPM_BUILD_ROOT/etc/env.d/VTYSH_PAGER @@ -296,6 +311,13 @@ if [ ! -s %{_sysconfdir}/zebra.conf ]; then fi %service zebra restart main
[packages/quagga] - obsolete
commit 5573df92e6ce14cde2f8aa27fe1c1c250efad551 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 17:01:13 2014 +0200 - obsolete quagga-fix-ipremove.patch | 23 --- quagga-link.patch | 11 --- 2 files changed, 34 deletions(-) --- diff --git a/quagga-fix-ipremove.patch b/quagga-fix-ipremove.patch deleted file mode 100644 index 9f2dd01..000 --- a/quagga-fix-ipremove.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur quagga-0.99.14/zebra/interface.c quagga-0.99.14-fix-ipremove/zebra/interface.c quagga-0.99.14/zebra/interface.c 2009-07-21 13:11:21.0 +0100 -+++ quagga-0.99.14-fix-ipremove/zebra/interface.c 2009-08-12 17:04:14.0 +0100 -@@ -1293,17 +1293,17 @@ - return CMD_WARNING; - } - --#if 0 - /* Redistribute this information. */ - zebra_interface_address_delete_update (ifp, ifc); - - /* Remove connected route. */ - connected_down_ipv4 (ifp, ifc); - -+ if_subnet_delete(ifp, ifc); -+ - /* Free address information. */ - listnode_delete (ifp-connected, ifc); - connected_free (ifc); --#endif - - return CMD_SUCCESS; - } diff --git a/quagga-link.patch b/quagga-link.patch deleted file mode 100644 index a01cb26..000 --- a/quagga-link.patch +++ /dev/null @@ -1,11 +0,0 @@ quagga-0.99.14/lib/Makefile.am~2009-05-08 17:46:43.0 +0200 -+++ quagga-0.99.14/lib/Makefile.am 2009-08-04 10:33:59.0 +0200 -@@ -18,7 +18,7 @@ - - libzebra_la_DEPENDENCIES = @LIB_REGEX@ - --libzebra_la_LIBADD = @LIB_REGEX@ -+libzebra_la_LIBADD = @LIB_REGEX@ @LIBCAP@ - - pkginclude_HEADERS = \ - buffer.h checksum.h command.h filter.h getopt.h hash.h \ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/7f780b21db9eb39908f4cc3f997d0396cece2914 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - BABEL wireless mesh routing
commit 015c4387225243c69b3a26f77a8586d2ad024c33 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 17:06:55 2014 +0200 - BABEL wireless mesh routing quagga-babeld.init | 75 quagga-babeld.init~ | 75 quagga-babeld.logrotate | 9 ++ quagga-babeld.logrotate~ | 9 ++ quagga-babeld.sysconfig | 18 quagga-babeld.sysconfig~ | 18 6 files changed, 204 insertions(+) --- diff --git a/quagga-babeld.init b/quagga-babeld.init new file mode 100644 index 000..2986ecb --- /dev/null +++ b/quagga-babeld.init @@ -0,0 +1,75 @@ +#!/bin/sh +# +# babeld Starts the Dynamic Route Daemon +# +# chkconfig: 345 15 84 +# +# description: Dynamic Route Daemon for IPv4 and IPv6 routers +# +# processname: babeld +# config: /etc/zebra/babeld.conf + + +# Source function library +. /etc/rc.d/init.d/functions + +# Get network config +. /etc/sysconfig/network + +# Get service config +[ -f /etc/sysconfig/babeld ] . /etc/sysconfig/babeld + +# Check that networking is up. +if is_yes ${NETWORKING}; then + if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ]; then + msg_network_down babeld + exit 1 + fi +else + exit 0 +fi + +RETVAL=0 +# See how we were called. +case $1 in + start) + # Check if the services are already running? + if [ ! -f /var/lock/subsys/babeld ]; then + FLAGS=--daemon + is_yes $RETAIN_ROUTES FLAGS=$FLAGS --retain + is_yes $NO_KERNEL FLAGS=$FLAGS --no_kernel +[ -n $VTY_ADDR ] FLAGS=$FLAGS --vty_addr $VTY_ADDR +[ -n $VTY_PORT ] FLAGS=$FLAGS --vty_port $VTY_PORT + msg_starting babeld + daemon babeld $FLAGS + RETVAL=$? + [ $RETVAL -eq 0 ] touch /var/lock/subsys/babeld + else + msg_already_running babeld + fi + ;; + stop) + if [ -f /var/lock/subsys/babeld ]; then + # Stop daemons. + msg_stopping babeld + killproc babeld + rm -f /var/lock/subsys/babeld + else + msg_not_running babeld + fi + ;; + status) + status babeld + exit $? + ;; + restart|force-reload) + $0 stop + $0 start + exit $? + ;; + *) + msg_usage $0 {start|stop|restart|force-reload|status} + exit 3 +esac + +exit $RETVAL diff --git a/quagga-babeld.init~ b/quagga-babeld.init~ new file mode 100644 index 000..2b7ec1b --- /dev/null +++ b/quagga-babeld.init~ @@ -0,0 +1,75 @@ +#!/bin/sh +# +# bgpd Starts the Dynamic Route Daemon +# +# chkconfig: 345 15 84 +# +# description: Dynamic Route Daemon for IPv4 and IPv6 routers +# +# processname: bgpd +# config: /etc/zebra/bgpd.conf + + +# Source function library +. /etc/rc.d/init.d/functions + +# Get network config +. /etc/sysconfig/network + +# Get service config +[ -f /etc/sysconfig/bgpd ] . /etc/sysconfig/bgpd + +# Check that networking is up. +if is_yes ${NETWORKING}; then + if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ]; then + msg_network_down bgpd + exit 1 + fi +else + exit 0 +fi + +RETVAL=0 +# See how we were called. +case $1 in + start) + # Check if the services are already running? + if [ ! -f /var/lock/subsys/bgpd ]; then + FLAGS=--daemon + is_yes $RETAIN_ROUTES FLAGS=$FLAGS --retain + is_yes $NO_KERNEL FLAGS=$FLAGS --no_kernel +[ -n $VTY_ADDR ] FLAGS=$FLAGS --vty_addr $VTY_ADDR +[ -n $VTY_PORT ] FLAGS=$FLAGS --vty_port $VTY_PORT + msg_starting bgpd + daemon bgpd $FLAGS + RETVAL=$? + [ $RETVAL -eq 0 ] touch /var/lock/subsys/bgpd + else + msg_already_running bgpd + fi + ;; + stop) + if [ -f /var/lock/subsys/bgpd ]; then + # Stop daemons. + msg_stopping bgpd + killproc bgpd + rm -f /var/lock/subsys/bgpd + else + msg_not_running bgpd + fi + ;; + status) + status bgpd + exit $? + ;; + restart|force-reload) + $0 stop + $0 start + exit $? + ;; + *) + msg_usage $0 {start|stop|restart|force-reload|status} + exit 3 +esac + +exit $RETVAL diff --git a/quagga-babeld.logrotate b/quagga-babeld.logrotate new file mode 100644 index 000..16a0438 --- /dev/null +++ b/quagga-babeld.logrotate @@ -0,0 +1,9 @@ +/var/log/quagga/babeld.log { + su quagga quagga + missingok + olddir /var/log/archive/quagga + create 640 quagga quagga + postrotate + /bin/killall -USR1 babeld /dev/null 21 + endscript +} diff
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - adaptarized
commit f012ea02243962e7c1c2a67d1173f9c61e5ae508 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 17:09:57 2014 +0200 - adaptarized quagga.spec | 72 ++--- 1 file changed, 36 insertions(+), 36 deletions(-) --- diff --git a/quagga.spec b/quagga.spec index 034c199..a5aedc6 100644 --- a/quagga.spec +++ b/quagga.spec @@ -97,11 +97,11 @@ zgromadzenie bardziej zaangażowanej społeczności wokół projektu, niż w aktualnie scentralizowanym modelu GNU Zebry. %package babeld -Summary:BABEL wireless mesh routing daemon -Summary(pl.UTF-8): Demon routingu BABEL -Group: Networking/Daemons -Requires(post,preun): /sbin/chkconfig -Requires: %{name} = %{version}-%{release} +Summary: BABEL wireless mesh routing daemon +Summary(pl.UTF-8): Demon routingu BABEL +Group: Networking/Daemons +Requires(post,preun): /sbin/chkconfig +Requires: %{name} = %{version}-%{release} %description babeld BABEL wireless mesh routing daemon. Includes IPv6 support. @@ -252,40 +252,40 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{env.d,logrotate.d,pam.d,rc.d/init.d,sysconfig} \ $RPM_BUILD_ROOT/var/log/{archive,}/%{name} \ $RPM_BUILD_ROOT%{_var}/run/%{name} \ - $RPM_BUILD_ROOT/usr/lib/tmpfiles.d + $RPM_BUILD_ROOT%{systemdtmpfilesdir} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra -install %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf - -install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra -install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd -install %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d -install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd -install %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd -install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd -install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd -install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld - -install %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra -install %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd -install %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d -install %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd -install %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd -install %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd -install %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd -install %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld - -install %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra -install %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd -install %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd -install %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d -install %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd -install %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd -install %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd -install %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld +cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra +cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + +cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra +cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd +cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d +cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd +cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd +cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd +cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd +cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld + +cp -p %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra +cp -p %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd +cp -p %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d +cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd +cp -p %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd +cp -p %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd +cp -p %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd +cp -p %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld + +cp -p %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra +cp -p %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd +cp -p %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd +cp -p %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d +cp -p %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd +cp -p %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd +cp -p %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd +cp -p %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld touch $RPM_BUILD_ROOT/var/log/%{name}/{zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.log @@ -428,7 +428,7 @@ fi %dir %attr(770,root,quagga) %{_sysconfdir} %config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga) %{_sysconfdir}/vtysh.conf %config(noreplace) %verify(not md5 mtime size) %attr(660,root,quagga) %{_sysconfdir}/zebra.conf -/usr/lib/tmpfiles.d/%{name}.conf +%{systemdtmpfilesdir}/%{name}.conf %dir %attr(770,root,quagga) /var/run/%{name} %dir %attr(750,quagga,quagga) /var/log/%{name} %dir
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - removed temporary files
commit 2a72976917300d32f3d6f603d99ebd233492f0e7 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 17:11:28 2014 +0200 - removed temporary files quagga-babeld.init~ | 75 quagga-babeld.logrotate~ | 9 -- quagga-babeld.sysconfig~ | 18 3 files changed, 102 deletions(-) --- diff --git a/quagga-babeld.init~ b/quagga-babeld.init~ deleted file mode 100644 index 2b7ec1b..000 --- a/quagga-babeld.init~ +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# -# bgpd Starts the Dynamic Route Daemon -# -# chkconfig: 345 15 84 -# -# description: Dynamic Route Daemon for IPv4 and IPv6 routers -# -# processname: bgpd -# config: /etc/zebra/bgpd.conf - - -# Source function library -. /etc/rc.d/init.d/functions - -# Get network config -. /etc/sysconfig/network - -# Get service config -[ -f /etc/sysconfig/bgpd ] . /etc/sysconfig/bgpd - -# Check that networking is up. -if is_yes ${NETWORKING}; then - if [ ! -f /var/lock/subsys/network -a $1 != stop -a $1 != status ]; then - msg_network_down bgpd - exit 1 - fi -else - exit 0 -fi - -RETVAL=0 -# See how we were called. -case $1 in - start) - # Check if the services are already running? - if [ ! -f /var/lock/subsys/bgpd ]; then - FLAGS=--daemon - is_yes $RETAIN_ROUTES FLAGS=$FLAGS --retain - is_yes $NO_KERNEL FLAGS=$FLAGS --no_kernel -[ -n $VTY_ADDR ] FLAGS=$FLAGS --vty_addr $VTY_ADDR -[ -n $VTY_PORT ] FLAGS=$FLAGS --vty_port $VTY_PORT - msg_starting bgpd - daemon bgpd $FLAGS - RETVAL=$? - [ $RETVAL -eq 0 ] touch /var/lock/subsys/bgpd - else - msg_already_running bgpd - fi - ;; - stop) - if [ -f /var/lock/subsys/bgpd ]; then - # Stop daemons. - msg_stopping bgpd - killproc bgpd - rm -f /var/lock/subsys/bgpd - else - msg_not_running bgpd - fi - ;; - status) - status bgpd - exit $? - ;; - restart|force-reload) - $0 stop - $0 start - exit $? - ;; - *) - msg_usage $0 {start|stop|restart|force-reload|status} - exit 3 -esac - -exit $RETVAL diff --git a/quagga-babeld.logrotate~ b/quagga-babeld.logrotate~ deleted file mode 100644 index 650afcc..000 --- a/quagga-babeld.logrotate~ +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/quagga/bgpd.log { - su quagga quagga - missingok - olddir /var/log/archive/quagga - create 640 quagga quagga - postrotate - /bin/killall -USR1 bgpd /dev/null 21 - endscript -} diff --git a/quagga-babeld.sysconfig~ b/quagga-babeld.sysconfig~ deleted file mode 100644 index 4cf193d..000 --- a/quagga-babeld.sysconfig~ +++ /dev/null @@ -1,18 +0,0 @@ -# Customized setings for zebra bgpd - -# Nice level for routing daemon [-10 - +10] -SERVICE_RUN_NICE_LEVEL=+2 - -# When program terminates, retain added route by zebra. -#RETAIN_ROUTES=yes - -# Do not install route to kernel. -#NO_KERNEL=yes - -# The address that the bgpd VTY will listen on. -# Default is all intrefaces. -#VTY_ADDR=127.0.0.1 - -# The port that the bgpd VTY will listen on. -# Default is 2605. -#VTY_PORT=2605 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/2a72976917300d32f3d6f603d99ebd233492f0e7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/quagga] - reverted adaptarization: install instead of cp -p
commit 3ce73af38c241701281131769db7444c330d8b17 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat May 3 19:45:16 2014 +0200 - reverted adaptarization: install instead of cp -p quagga.spec | 58 +- 1 file changed, 29 insertions(+), 29 deletions(-) --- diff --git a/quagga.spec b/quagga.spec index a5aedc6..e881ca4 100644 --- a/quagga.spec +++ b/quagga.spec @@ -257,35 +257,35 @@ install -d $RPM_BUILD_ROOT/etc/{env.d,logrotate.d,pam.d,rc.d/init.d,sysconfig} \ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra -cp -p %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf - -cp -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra -cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd -cp -p %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d -cp -p %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd -cp -p %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd -cp -p %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd -cp -p %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd -cp -p %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld - -cp -p %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra -cp -p %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd -cp -p %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d -cp -p %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd -cp -p %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd -cp -p %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd -cp -p %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd -cp -p %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld - -cp -p %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra -cp -p %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd -cp -p %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd -cp -p %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d -cp -p %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd -cp -p %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd -cp -p %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd -cp -p %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld +install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/zebra +install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf + +install %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/zebra +install %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bgpd +install %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospf6d +install %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/ospfd +install %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripd +install %{SOURCE15} $RPM_BUILD_ROOT/etc/rc.d/init.d/ripngd +install %{SOURCE16} $RPM_BUILD_ROOT/etc/rc.d/init.d/isisd +install %{SOURCE17} $RPM_BUILD_ROOT/etc/rc.d/init.d/babeld + +install %{SOURCE20} $RPM_BUILD_ROOT/etc/sysconfig/zebra +install %{SOURCE21} $RPM_BUILD_ROOT/etc/sysconfig/bgpd +install %{SOURCE22} $RPM_BUILD_ROOT/etc/sysconfig/ospf6d +install %{SOURCE23} $RPM_BUILD_ROOT/etc/sysconfig/ospfd +install %{SOURCE24} $RPM_BUILD_ROOT/etc/sysconfig/ripd +install %{SOURCE25} $RPM_BUILD_ROOT/etc/sysconfig/ripngd +install %{SOURCE26} $RPM_BUILD_ROOT/etc/sysconfig/isisd +install %{SOURCE27} $RPM_BUILD_ROOT/etc/sysconfig/babeld + +install %{SOURCE30} $RPM_BUILD_ROOT/etc/logrotate.d/zebra +install %{SOURCE31} $RPM_BUILD_ROOT/etc/logrotate.d/bgpd +install %{SOURCE32} $RPM_BUILD_ROOT/etc/logrotate.d/ospfd +install %{SOURCE33} $RPM_BUILD_ROOT/etc/logrotate.d/ospf6d +install %{SOURCE34} $RPM_BUILD_ROOT/etc/logrotate.d/ripd +install %{SOURCE35} $RPM_BUILD_ROOT/etc/logrotate.d/ripngd +install %{SOURCE36} $RPM_BUILD_ROOT/etc/logrotate.d/isisd +install %{SOURCE37} $RPM_BUILD_ROOT/etc/logrotate.d/babeld touch $RPM_BUILD_ROOT/var/log/%{name}/{zebra,babeld,bgpd,isisd,ospf6d,ospfd,ripd,ripngd}.log gitweb: http://git.pld-linux.org/gitweb.cgi/packages/quagga.git/commitdiff/3ce73af38c241701281131769db7444c330d8b17 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: quagga: ERRORS: quagga-0.99.22.4.tar.gz
FATAL: http://www.quagga.net/download/quagga-0.99.22.4.tar.gz md5 mismatch, needed 27ef98abb1820bae19eb71f631a10853, got 95944647f0a0485b0fbd6843d89af476 Files fetched: 0 -- 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: otrs: otrs-3.3.5.tar.bz2
Files fetched: 1 STORED: http://ftp.otrs.org/pub/otrs/otrs-3.3.5.tar.bz2 1bd5a0a8fac9a2348c668cbb485d666e otrs-3.3.5.tar.bz2 Size: 20125469 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - updated for 3.3.5
commit 4160b2824b789fe9a1381339e96e2ca792d07a7f Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 28 14:24:23 2014 +0100 - updated for 3.3.5 otrs-paths.patch | 138 --- 1 file changed, 90 insertions(+), 48 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index 49928c6..7a32af6 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -1,18 +1,20 @@ otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 -+++ otrs-3.2.1.new/bin/Cron.sh 2013-02-08 12:49:37.545377896 +0100 -@@ -45,16 +45,16 @@ +diff -ur otrs-3.3.5/bin/Cron.sh otrs-3.3.5.new/bin/Cron.sh +--- otrs-3.3.5/bin/Cron.sh 2014-02-20 09:22:07.0 +0100 otrs-3.3.5.new/bin/Cron.sh 2014-02-28 13:44:49.814960681 +0100 +@@ -43,16 +43,16 @@ OTRS_HOME=`pwd` cd - --#OTRS_ROOT=/opt/OpenTRS +-#OTRS_ROOT=/opt/otrs -if test -e $OTRS_HOME/var/cron; then +#OTRS_ROOT=/usr/share/otrs +if test -e /etc/cron.d; then OTRS_ROOT=$OTRS_HOME else -echo No cronjobs in $OTRS_HOME/var/cron found!; +-echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /opt/otrs). ; +echo No cronjobs in /etc/cron.d found!; - echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /opt/otrs). ; ++echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /usr/share/otrs). ; exit 5; fi @@ -20,10 +22,12 @@ +CRON_DIR=/etc/cron.d CRON_TMP_FILE=$OTRS_ROOT/var/tmp/otrs-cron-tmp.$$ - echo Cron.sh - start/stop OTRS cronjobs - \$Revision: 1.22 $ otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 -+++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-02-08 12:49:37.538710921 +0100 -@@ -82,7 +82,7 @@ + echo Cron.sh - start/stop OTRS cronjobs +Tylko w otrs-3.3.5.new/bin: Cron.sh~ +diff -ur otrs-3.3.5/bin/otrs.SetPermissions.pl otrs-3.3.5.new/bin/otrs.SetPermissions.pl +--- otrs-3.3.5/bin/otrs.SetPermissions.pl 2014-02-20 09:22:07.0 +0100 otrs-3.3.5.new/bin/otrs.SetPermissions.pl 2014-02-28 13:46:22.849207187 +0100 +@@ -77,7 +77,7 @@ [--not-root] OTRS_HOME @@ -32,9 +36,11 @@ EOF if ( $#ARGV 0 ) { otrs-3.2.1/Kernel/Config/Defaults.pm 2013-01-17 10:06:52.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-02-08 12:49:37.542044408 +0100 -@@ -297,7 +297,7 @@ +Tylko w otrs-3.3.5.new/bin: otrs.SetPermissions.pl~ +diff -ur otrs-3.3.5/Kernel/Config/Defaults.pm otrs-3.3.5.new/Kernel/Config/Defaults.pm +--- otrs-3.3.5/Kernel/Config/Defaults.pm 2014-02-20 09:22:11.0 +0100 otrs-3.3.5.new/Kernel/Config/Defaults.pm 2014-02-28 13:47:21.181869809 +0100 +@@ -292,7 +292,7 @@ #$Self-{'LogModule::SysLog::Charset'} = 'utf-8'; # param for LogModule Kernel::System::Log::File (required!) @@ -43,7 +49,7 @@ # param if the date (-mm) should be added as suffix to # logfile [0|1] -@@ -824,7 +824,7 @@ +@@ -803,7 +803,7 @@ # directories # # --- # # root directory @@ -52,7 +58,7 @@ # tmp dir $Self-{TempDir} = 'OTRS_CONFIG_Home/var/tmp'; -@@ -965,7 +965,7 @@ +@@ -966,7 +966,7 @@ # --- # $Self-{PGP} = 0; $Self-{'PGP::Bin'} = '/usr/bin/gpg'; @@ -61,9 +67,11 @@ #$Self-{'PGP::Options'} = '--batch --no-tty --yes'; #$Self-{'PGP::Key::Password'}-{'D2DF79FA'} = 1234; otrs-3.2.1/Kernel/Config/Files/Framework.xml 2013-01-03 10:12:36.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-02-08 12:49:37.545377896 +0100 -@@ -493,7 +493,7 @@ +Tylko w otrs-3.3.5.new/Kernel/Config: Defaults.pm~ +diff -ur otrs-3.3.5/Kernel/Config/Files/Framework.xml otrs-3.3.5.new/Kernel/Config/Files/Framework.xml +--- otrs-3.3.5/Kernel/Config/Files/Framework.xml 2014-02-20 09:22:11.0 +0100 otrs-3.3.5.new/Kernel/Config/Files/Framework.xml 2014-02-28 13:48:17.254429304 +0100 +@@ -507,7 +507,7 @@ GroupFramework/Group SubGroupCore::Log/SubGroup Setting @@ -72,7 +80,7 @@ /Setting /ConfigItem ConfigItem Name=LogModule::LogFile::Date Required=1 Valid=1 -@@ -2834,7 +2834,7 @@ +@@ -2867,7 +2867,7 @@ GroupFramework/Group SubGroupCrypt::PGP/SubGroup Setting @@ -81,21 +89,24 @@ /Setting /ConfigItem ConfigItem Name=PGP::Key::Password Required=1 Valid=1 otrs-3.2.1/Kernel/Config/Files/Ticket.xml 2013-01-24 11:21:12.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config/Files/Ticket.xml 2013-02-08 12:50:32.791264354 +0100 -@@ -215,7 +215,7 @@ +Tylko w otrs-3.3.5.new/Kernel/Config/Files: Framework.xml~ +diff -ur
[packages/otrs] - updated to 3.3.5
commit 43783c418749af9b59555b8332cdff2805f36e04 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 28 14:24:32 2014 +0100 - updated to 3.3.5 otrs.spec | 38 ++ 1 file changed, 22 insertions(+), 16 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index d145800..4851862 100644 --- a/otrs.spec +++ b/otrs.spec @@ -7,13 +7,13 @@ Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs -Version: 3.2.2 +Version: 3.3.5 Release: 0.1 Epoch: 1 License: GPL Group: Applications/Databases Source0: http://ftp.otrs.org/pub/otrs/%{name}-%{version}.tar.bz2 -# Source0-md5: 31a402aa4352c7e1df10ca0a9aa578a2 +# Source0-md5: 1bd5a0a8fac9a2348c668cbb485d666e Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch @@ -227,7 +227,7 @@ fi %files %defattr(644,root,root,755) -%doc ARCHIVE CHANGES COPYING COPYING-Third-Party CREDITS doc/ README README.database README.webserver RELEASE UPGRADING +%doc ARCHIVE COPYING COPYING-Third-Party doc/ INSTALL.md README.md README.database.md README.webserver.md RELEASE UPGRADING.md %doc scripts/test Kernel/Config/GenericAgent.pm.examples %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/otrs %attr(751,otrs,http) %dir %{_sysconfdir}/%{name} @@ -284,17 +284,22 @@ fi %dir %{otrsdir}/Kernel/Scheduler/TaskHandler %dir %{otrsdir}/Kernel/System %{otrsdir}/Kernel/System/*.pm +%dir %{otrsdir}/Kernel/System/ACL +%dir %{otrsdir}/Kernel/System/ACL/DB %dir %{otrsdir}/Kernel/System/Auth %dir %{otrsdir}/Kernel/System/Auth/Sync %dir %{otrsdir}/Kernel/System/AuthSession %dir %{otrsdir}/Kernel/System/Cache %dir %{otrsdir}/Kernel/System/Crypt %dir %{otrsdir}/Kernel/System/CustomerAuth +%dir %{otrsdir}/Kernel/System/CustomerCompany +%dir %{otrsdir}/Kernel/System/CustomerCompany/Event %dir %{otrsdir}/Kernel/System/CustomerUser +%dir %{otrsdir}/Kernel/System/CustomerUser/Event %dir %{otrsdir}/Kernel/System/CustomerUser/Preferences %dir %{otrsdir}/Kernel/System/DB %dir %{otrsdir}/Kernel/System/DynamicField -%dir %{otrsdir}/Kernel/System/DynamicField/Backend +%dir %{otrsdir}/Kernel/System/DynamicField/Driver %dir %{otrsdir}/Kernel/System/DynamicField/ObjectType %dir %{otrsdir}/Kernel/System/Email %dir %{otrsdir}/Kernel/System/GenericAgent @@ -339,14 +344,13 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/Apache %dir %{otrsdir}/Kernel/cpan-lib/Apache2 %dir %{otrsdir}/Kernel/cpan-lib/CGI +%dir %{otrsdir}/Kernel/cpan-lib/CGI/Emulate +%dir %{otrsdir}/Kernel/cpan-lib/CGI/Parse %dir %{otrsdir}/Kernel/cpan-lib/Class %dir %{otrsdir}/Kernel/cpan-lib/Class/Inspector %dir %{otrsdir}/Kernel/cpan-lib/Crypt %dir %{otrsdir}/Kernel/cpan-lib/CSS -%dir %{otrsdir}/Kernel/cpan-lib/Digest -%dir %{otrsdir}/Kernel/cpan-lib/Digest/SHA %dir %{otrsdir}/Kernel/cpan-lib/Encode -%dir %{otrsdir}/Kernel/cpan-lib/File %dir %{otrsdir}/Kernel/cpan-lib/HTTP %dir %{otrsdir}/Kernel/cpan-lib/HTTP/Headers %dir %{otrsdir}/Kernel/cpan-lib/HTTP/Request @@ -357,19 +361,19 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/LWP %dir %{otrsdir}/Kernel/cpan-lib/LWP/Authen %dir %{otrsdir}/Kernel/cpan-lib/LWP/Protocol +%dir %{otrsdir}/Kernel/cpan-lib/Linux %dir %{otrsdir}/Kernel/cpan-lib/Locale %dir %{otrsdir}/Kernel/cpan-lib/Locale/Codes +%dir %{otrsdir}/Kernel/cpan-lib/Module %dir %{otrsdir}/Kernel/cpan-lib/Mozilla %dir %{otrsdir}/Kernel/cpan-lib/Mozilla/CA %{otrsdir}/Kernel/cpan-lib/Mozilla/CA/cacert.pem %dir %{otrsdir}/Kernel/cpan-lib/Net +%dir %{otrsdir}/Kernel/cpan-lib/Net/HTTP %dir %{otrsdir}/Kernel/cpan-lib/Net/IMAP %dir %{otrsdir}/Kernel/cpan-lib/Net/IMAP/Simple %{otrsdir}/Kernel/cpan-lib/Net/IMAP/Simple/*.pm -%dir %{otrsdir}/Kernel/cpan-lib/Net/POP3 -%dir %{otrsdir}/Kernel/cpan-lib/Net/SMTP -%dir %{otrsdir}/Kernel/cpan-lib/Net/SMTP/TLS -%{otrsdir}/Kernel/cpan-lib/Net/SMTP/TLS/*.pm +%dir %{otrsdir}/Kernel/cpan-lib/Net/SSLGlue %dir %{otrsdir}/Kernel/cpan-lib/Proc %{otrsdir}/Kernel/cpan-lib/Proc/Daemon.pod %dir %{otrsdir}/Kernel/cpan-lib/SOAP @@ -377,6 +381,8 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/SOAP/Lite/Deserializer %{otrsdir}/Kernel/cpan-lib/SOAP/Lite/Deserializer/*.pm %dir %{otrsdir}/Kernel/cpan-lib/SOAP/Transport +%dir %{otrsdir}/Kernel/cpan-lib/Sys +%dir %{otrsdir}/Kernel/cpan-lib/Sys/Hostname %dir %{otrsdir}/Kernel/cpan-lib/Text %dir %{otrsdir}/Kernel/cpan-lib/Text/Diff %dir %{otrsdir}/Kernel/cpan-lib/URI @@ -385,6 +391,7 @@ fi %dir %{otrsdir}/Kernel/cpan-lib/YAML %dir %{otrsdir}/Kernel/cpan-lib/YAML/Dumper %dir %{otrsdir}/Kernel/cpan-lib/YAML/Loader +#%dir %{otrsdir}/Kernel/cpan-lib/version %dir %{otrsdir}/bin %attr(700,otrs,root) %{otrsdir}/bin/*.sh %attr(700,otrs,root) %{otrsdir}/bin/otrs.* @@ -392,7 +399,6 @@ fi %attr(750,root,http) %{otrsdir}/bin/cgi-bin/*.pl %dir %{otrsdir}/bin/fcgi-bin/ %attr(750,root,http)
[packages/kernel/LINUX_3_7] - %s/%{kgcc}/%{__cc}/g
commit e276d94632806c4b8526bd4623fd74f7d1b3de21 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Feb 6 14:13:46 2014 +0100 - %s/%{kgcc}/%{__cc}/g kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel.spec b/kernel.spec index aeb5a3f..e4feccc 100644 --- a/kernel.spec +++ b/kernel.spec @@ -342,7 +342,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %definetopdir %{_builddir}/%{name}-%{version} %definesrcdir %{topdir}/linux-%{basever} %defineobjdir %{topdir}/%{targetobj} -%definetargetobj %{_target_base_arch}-gcc-%(%{kgcc} -dumpversion) +%definetargetobj %{_target_base_arch}-gcc-%(%{__cc} -dumpversion) %define_kernelsrcdir /usr/src/linux%{_alt_kernel}-%{version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e276d94632806c4b8526bd4623fd74f7d1b3de21 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/accel-ppp] - updated to 1.7.3
commit dc7ba18119fc4ad70548e2f3dcc800891c8c3fe1 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sat Feb 1 17:07:53 2014 +0100 - updated to 1.7.3 accel-ppp.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/accel-ppp.spec b/accel-ppp.spec index e034b02..93b895e 100644 --- a/accel-ppp.spec +++ b/accel-ppp.spec @@ -6,13 +6,13 @@ # Summary: High performance PPTP/L2TP/PPPoE server Name: accel-ppp -Version: 1.6.1 +Version: 1.7.3 Release: 0.1 License: GPL v2+ Group: Networking URL: http://sourceforge.net/projects/accel-ppp/ Source0: http://downloads.sourceforge.net/accel-ppp/%{name}-%{version}.tar.bz2 -# Source0-md5: 8985ab9f743b952396f6dc53d6fd56a8 +# Source0-md5: bf03f20d9df9a0694e5cd0be9b57d1b6 Source1: %{name}.tmpfiles Source2: %{name}.init Source3: %{name}.logrotate gitweb: http://git.pld-linux.org/gitweb.cgi/packages/accel-ppp.git/commitdiff/dc7ba18119fc4ad70548e2f3dcc800891c8c3fe1 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: accel-ppp: accel-ppp-1.7.3.tar.bz2
Files fetched: 1 STORED: http://downloads.sourceforge.net/accel-ppp/accel-ppp-1.7.3.tar.bz2 bf03f20d9df9a0694e5cd0be9b57d1b6 accel-ppp-1.7.3.tar.bz2 Size: 1489289 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/radvd] - updated to 1.9.7
commit 67d117a7a19921ca42fe913ec077a3161e3dc2bd Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Dec 25 17:43:31 2013 +0100 - updated to 1.9.7 radvd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/radvd.spec b/radvd.spec index 41329cc..58f259c 100644 --- a/radvd.spec +++ b/radvd.spec @@ -1,12 +1,12 @@ Summary: Router Advertisement Daemon Summary(pl.UTF-8): Demon ogłaszania routerów Name: radvd -Version: 1.9.5 +Version: 1.9.7 Release: 1 License: GPL Group: Networking Source0: http://v6web.litech.org/radvd/dist/%{name}-%{version}.tar.gz -# Source0-md5: 0251d3b900fdf9f47fe676bd2b6b0168 +# Source0-md5: 85141c7dc7d35e5499e16052742f1040 Source1: %{name}.conf Source2: %{name}.init Source3: %{name}.tmpfiles gitweb: http://git.pld-linux.org/gitweb.cgi/packages/radvd.git/commitdiff/67d117a7a19921ca42fe913ec077a3161e3dc2bd ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: radvd: radvd-1.9.7.tar.gz
Files fetched: 1 STORED: http://v6web.litech.org/radvd/dist/radvd-1.9.7.tar.gz 85141c7dc7d35e5499e16052742f1040 radvd-1.9.7.tar.gz Size: 177244 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dovecot-pigeonhole] - updated URL
commit 203694b05784ff5f73268d64bb28f16c7fcf7dd0 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Dec 9 13:06:57 2013 +0100 - updated URL dovecot-pigeonhole.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec index 5493a3c..7ecf71c 100644 --- a/dovecot-pigeonhole.spec +++ b/dovecot-pigeonhole.spec @@ -16,7 +16,7 @@ Group:Daemons Source0: http://www.rename-it.nl/dovecot/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz # Source0-md5: a65196ff02c314eaf53373e281426bcd Patch0:%{name}-config.patch -URL: http://www.dovecot.org/ +URL: http://pigeonhole.dovecot.org/ BuildRequires: autoconf BuildRequires: automake BuildRequires: bison gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dovecot-pigeonhole.git/commitdiff/203694b05784ff5f73268d64bb28f16c7fcf7dd0 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dovecot-pigeonhole] - updated to 0.4.2
commit dd59949744c891b57cf548e293d9e6c4d377757b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Dec 9 13:12:06 2013 +0100 - updated to 0.4.2 dovecot-pigeonhole.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/dovecot-pigeonhole.spec b/dovecot-pigeonhole.spec index 7ecf71c..76bf068 100644 --- a/dovecot-pigeonhole.spec +++ b/dovecot-pigeonhole.spec @@ -5,16 +5,16 @@ # - fix mess with dovecot libraries (symlinks in package that shouldn't be here) %definedovecot_series 2.2 -%definepigeonhole_version 0.4.1 +%definepigeonhole_version 0.4.2 Summary: Sieve plugin for dovecot Summary(pl.UTF-8): Wtyczka Sieve i Managesieve dla dovecota Name: dovecot-pigeonhole Version: %{dovecot_series}_%{pigeonhole_version} -Release: 2 +Release: 1 License: LGPL Group: Daemons Source0: http://www.rename-it.nl/dovecot/%{dovecot_series}/dovecot-%{dovecot_series}-pigeonhole-%{pigeonhole_version}.tar.gz -# Source0-md5: a65196ff02c314eaf53373e281426bcd +# Source0-md5: e8cb4976db9811d37e9d870f2f75ffef Patch0:%{name}-config.patch URL: http://pigeonhole.dovecot.org/ BuildRequires: autoconf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dovecot-pigeonhole.git/commitdiff/dd59949744c891b57cf548e293d9e6c4d377757b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dovecot-pigeonhole: dovecot-2.2-pigeonhole-0.4.2.tar.gz
Files fetched: 1 STORED: http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-pigeonhole-0.4.2.tar.gz e8cb4976db9811d37e9d870f2f75ffef dovecot-2.2-pigeonhole-0.4.2.tar.gz Size: 1159311 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ipset] - release 3
commit d07d587a5511cafc0d7a6370e2b94f1b72c4873b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Nov 18 21:46:18 2013 +0100 - release 3 ipset.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/ipset.spec b/ipset.spec index ab244a0..832a3b0 100644 --- a/ipset.spec +++ b/ipset.spec @@ -42,7 +42,7 @@ exit 1 %definekpkg%(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define alt_kernel $n ; echo %%kernel_pkg ; done) %definebkpkg %(echo %{_build_kernels} | tr , '\\n' | while read n ; do echo %%undefine alt_kernel ; [ -z $n ] || echo %%define alt_kernel $n ; echo %%build_kernel_pkg ; done) -%definerel 2 +%definerel 3 %definepname ipset Summary: IP sets utility Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/d07d587a5511cafc0d7a6370e2b94f1b72c4873b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel-tools] - updated for 3.10.19
commit ee2601301b49cb2fcb36f2cc644d656561883184 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Nov 19 04:32:05 2013 +0100 - updated for 3.10.19 kernel-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel-tools.spec b/kernel-tools.spec index 207997a..ac00926 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -12,7 +12,7 @@ %definerel 1 %definebasever 3.10 -%definepostver .18 +%definepostver .19 Summary: Assortment of tools for the Linux kernel Summary(pl.UTF-8): Zestaw narzędzi dla jądra Linuksa Name: kernel-tools gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/ee2601301b49cb2fcb36f2cc644d656561883184 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel-tools: ERRORS: linux-3.10.tar.xz patch-3.10.19.xz
FATAL: http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.10.19.xz md5 mismatch, needed e39b75595bf61d758087e1ddecd01a12, got b7f932eecbbf5636ad69add480fa1573 Files fetched: 0 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.10.tar.xz 4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/kernel-tools] - updated md5
commit 8202c6d805aacc7a8090ad39bf6fbc5dd8345df3 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Nov 19 04:35:22 2013 +0100 - updated md5 kernel-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/kernel-tools.spec b/kernel-tools.spec index ac00926..0ccdc9a 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -24,7 +24,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481 %if %{postver} != .0 Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Patch0-md5: e39b75595bf61d758087e1ddecd01a12 +# Patch0-md5: b7f932eecbbf5636ad69add480fa1573 %endif Source1: cpupower.service Source2: cpupower.config gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel-tools.git/commitdiff/8202c6d805aacc7a8090ad39bf6fbc5dd8345df3 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/iproute2] - 2 upstream patches which fixes tc HTB: http://git.kernel.org/cgit/linux/kernel/git/shemminger/ip
commit abeeb5d0e8ed5a4138fa7f4fb8bbdd57086e6d5b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sun Oct 27 21:47:16 2013 +0100 - 2 upstream patches which fixes tc HTB: http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/patch/?id=0a502b21e30be835dcad8d9c6023a41da8709eb1 http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/patch/?id=734c0ca2cabf96e2ac1abe6e1b0968d0b5b03b11 iproute2-htbupstreamfix.patch | 72 +++ 1 file changed, 72 insertions(+) --- diff --git a/iproute2-htbupstreamfix.patch b/iproute2-htbupstreamfix.patch new file mode 100644 index 000..e322653 --- /dev/null +++ b/iproute2-htbupstreamfix.patch @@ -0,0 +1,72 @@ +From 0a502b21e30be835dcad8d9c6023a41da8709eb1 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger step...@networkplumber.org +Date: Sun, 27 Oct 2013 19:26:47 + +Subject: Fix handling of qdis without options + +Some qdisc like htb want the parse_qopt to be called even if no options +present. Fixes regression caused by: + +e9e78b0db0e023035e346ba67de838be851eb665 is the first bad commit +commit e9e78b0db0e023035e346ba67de838be851eb665 +Author: Stephen Hemminger step...@networkplumber.org +Date: Mon Aug 26 08:41:19 2013 -0700 + +tc: allow qdisc without options +--- +diff --git a/tc/tc_qdisc.c b/tc/tc_qdisc.c +index 3002a56..e304858 100644 +--- a/tc/tc_qdisc.c b/tc/tc_qdisc.c +@@ -137,15 +137,16 @@ static int tc_qdisc_modify(int cmd, unsigned flags, int argc, char **argv) + if (est.ewma_log) + addattr_l(req.n, sizeof(req), TCA_RATE, est, sizeof(est)); + +- if (argc) { +- if (q) { +- if (!q-parse_qopt) { +- fprintf(stderr, qdisc '%s' does not support option parsing\n, k); +- return -1; +- } ++ if (q) { ++ if (q-parse_qopt) { + if (q-parse_qopt(q, argc, argv, req.n)) + return 1; +- } else { ++ } else if (argc) { ++ fprintf(stderr, qdisc '%s' does not support option parsing\n, k); ++ return -1; ++ } ++ } else { ++ if (argc) { + if (matches(*argv, help) == 0) + usage(); + +-- +cgit v0.9.2 +From 734c0ca2cabf96e2ac1abe6e1b0968d0b5b03b11 Mon Sep 17 00:00:00 2001 +From: Stephen Hemminger step...@networkplumber.org +Date: Sun, 27 Oct 2013 19:28:38 + +Subject: htb: remove old unused duplicate qdisc name + +Alexey had htb2 as name for version in ancient code. +--- +diff --git a/tc/q_htb.c b/tc/q_htb.c +index 6737ddb..e108857 100644 +--- a/tc/q_htb.c b/tc/q_htb.c +@@ -346,13 +346,3 @@ struct qdisc_util htb_qdisc_util = { + .parse_copt = htb_parse_class_opt, + .print_copt = htb_print_opt, + }; +- +-/* for testing of old one */ +-struct qdisc_util htb2_qdisc_util = { +- .id = htb2, +- .parse_qopt = htb_parse_opt, +- .print_qopt = htb_print_opt, +- .print_xstats = htb_print_xstats, +- .parse_copt = htb_parse_class_opt, +- .print_copt = htb_print_opt, +-}; +-- +cgit v0.9.2 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/iproute2.git/commitdiff/193f15e0ac331c94aa52d9eaefb65ec5e4efbd09 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/iproute2] - added 2 patches from upstream which fixes tc HTB - release 2
commit 193f15e0ac331c94aa52d9eaefb65ec5e4efbd09 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Sun Oct 27 21:48:25 2013 +0100 - added 2 patches from upstream which fixes tc HTB - release 2 iproute2.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- diff --git a/iproute2.spec b/iproute2.spec index 8231d4c..96e12a1 100644 --- a/iproute2.spec +++ b/iproute2.spec @@ -16,7 +16,7 @@ Summary(pl.UTF-8):Narzędzie do konfigurowania sieci Summary(pt_BR.UTF-8): Ferramentas para roteamento avançado e configuração de interfaces de rede Name: iproute2 Version: 3.11.0 -Release: 1 +Release: 2 License: GPL v2+ Group: Networking/Admin Source0: https://www.kernel.org/pub/linux/utils/net/iproute2/%{name}-%{version}.tar.xz @@ -25,6 +25,7 @@ Patch0: %{name}-arp.patch Patch1:%{name}-iptables.patch Patch2:%{name}-iptables64.patch Patch3:%{name}-LDFLAGS.patch +Patch4:%{name}-htbupstreamfix.patch # extensions Patch10: %{name}-2.2.4-wrr.patch Patch11: esfq-%{name}.patch @@ -121,7 +122,7 @@ Dokumentacja do iproute zawiera howto oraz przykłady ustawień. %patch1 -p1 %endif %patch3 -p1 - +%patch4 -p1 # extensions: %patch10 -p1 %patch11 -p1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/iproute2.git/commitdiff/193f15e0ac331c94aa52d9eaefb65ec5e4efbd09 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ipset] - updated to 6.20 - SONAME changed from libipset.so.3 to libipset.so.2
commit f9bd8c3a6283fd1d07fce4727603ea0de3052f38 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Oct 24 14:21:40 2013 +0200 - updated to 6.20 - SONAME changed from libipset.so.3 to libipset.so.2 ipset.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/ipset.spec b/ipset.spec index 4a902ad..ec6b8b9 100644 --- a/ipset.spec +++ b/ipset.spec @@ -20,18 +20,18 @@ %define_enable_debug_packages 0 %endif -%definerel 15 +%definerel 1 %definepname ipset Summary: IP sets utility Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP Name: %{pname}%{_alt_kernel} -Version: 6.19 +Version: 6.20 Release: %{rel} License: GPL v2 Group: Networking/Admin #Source0Download: http://ipset.netfilter.org/install.html Source0: http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2 -# Source0-md5: cabba1bd63a93f6e1c3db3fb22412b64 +# Source0-md5: af28b3af356fff3e4a8e321ff7145678 Source1: %{pname}.init Patch0:%{pname}-no_kernel.patch URL: http://ipset.netfilter.org/ @@ -200,7 +200,7 @@ fi %doc ChangeLog ChangeLog.ippool README UPGRADE %attr(755,root,root) %{_sbindir}/ipset %attr(755,root,root) %{_libdir}/libipset.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libipset.so.3 +%attr(755,root,root) %ghost %{_libdir}/libipset.so.2 %{_mandir}/man8/ipset.8* %files devel gitweb: http://git.pld-linux.org/gitweb.cgi/packages/ipset.git/commitdiff/f9bd8c3a6283fd1d07fce4727603ea0de3052f38 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: ipset: ipset-6.20.tar.bz2
Files fetched: 1 STORED: http://ipset.netfilter.org/ipset-6.20.tar.bz2 af28b3af356fff3e4a8e321ff7145678 ipset-6.20.tar.bz2 Size: 500469 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/open-vm-tools] - updated to 9.4.0 (matches VMWare tools for vSphere 5.5) - rel 1
commit 0c6e0b9c4115715cedf6db481714020b80acff90 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Oct 24 14:36:13 2013 +0200 - updated to 9.4.0 (matches VMWare tools for vSphere 5.5) - rel 1 open-vm-tools.spec | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/open-vm-tools.spec b/open-vm-tools.spec index 81b4570..ccc183f 100644 --- a/open-vm-tools.spec +++ b/open-vm-tools.spec @@ -13,9 +13,9 @@ %definesnap2011.10.26 %definesubver %(echo %{snap} | tr -d .) -%definever 9.2.3 -%definerev 1031360 -%definerel 17 +%definever 9.4.0 +%definerev 1280544 +%definerel 1 %definepname open-vm-tools %definemodsrc modules/linux Summary: VMWare guest utilities @@ -27,8 +27,8 @@ Release: %{rel} Epoch: 1 License: GPL Group: Applications/System -Source0: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.2.x/%{pname}-%{ver}-%{rev}.tar.gz -# Source0-md5: 71a1d8065b632692af2cdcc9d82f305e +Source0: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.4.x/%{pname}-%{ver}-%{rev}.tar.gz +# Source0-md5: 91f74bf6e42a3f460a42b3be31db31dc #Source0: http://downloads.sourceforge.net/open-vm-tools/open-vm-tools/%{snap}/%{pname}-%{snap}-%{rev}.tar.gz Source1: %{pname}-packaging Source2: %{pname}-modprobe.d gitweb: http://git.pld-linux.org/gitweb.cgi/packages/open-vm-tools.git/commitdiff/0c6e0b9c4115715cedf6db481714020b80acff90 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: open-vm-tools: open-vm-tools-9.4.0-1280544.tar.gz
Files fetched: 1 STORED: http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-9.4.x/open-vm-tools-9.4.0-1280544.tar.gz 91f74bf6e42a3f460a42b3be31db31dc open-vm-tools-9.4.0-1280544.tar.gz Size: 3659504 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Net-IPAddress] - initial
commit e4e56e43134c9e87e5f52dbdd36f9fd8a4e42cc9 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Oct 11 19:36:43 2013 +0200 - initial perl-Net-IPAddress.spec | 60 + 1 file changed, 60 insertions(+) --- diff --git a/perl-Net-IPAddress.spec b/perl-Net-IPAddress.spec new file mode 100644 index 000..fff7314 --- /dev/null +++ b/perl-Net-IPAddress.spec @@ -0,0 +1,60 @@ +# +# Conditional build: +%bcond_without tests # do not perform make test +# +%definepdirNet +%definepnamIPAddress +%include /usr/lib/rpm/macros.perl +Summary: Net::IPAddress - Functions used to manipulate IP addresses, masks and FQDN's +Name: perl-Net-IPAddress +Version: 1.10 +Release: 1 +License: GPL v1+ or Artistic +Group: Development/Languages/Perl +Source0: http://search.cpan.org/CPAN/authors/id/S/SA/SARENNER/Net-IPAddress-%{version}.tar.gz +# Source0-md5: 512117d3f6bcc027bd11f70d71f6f844 +# generic URL, check or change before uncommenting +#URL: http://search.cpan.org/dist/Net-IPAddress/ +BuildRequires: perl-devel = 1:5.8.0 +BuildRequires: rpm-perlprov = 4.1-13 +%if %{with tests} +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +Net::IPAddr is a collection of helpful functions used to convert IP +addresses to/from 32-bit integers, applying subnet masks to IP +addresses, validating IP address strings, and splitting a FQDN into +its host and domain parts. + +No rocket science here, but I have found these functions to very, very +handy. For example, have you ever tried to sort a list of IP addresses +only to find out that they don't sort the way you expected? Here is +the solution! If you convert the IP addresses to 32-bit integer +addresses, they will sort in correct order. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} pure_install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/Net/IPAddress.pm +%{_mandir}/man3/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-Net-IPAddress.git/commitdiff/e4e56e43134c9e87e5f52dbdd36f9fd8a4e42cc9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Net-IPAddress] Created branch master
The branch 'master' was created. Summary of new commits: e4e56e4... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-Net-IPAddress: Net-IPAddress-1.10.tar.gz
Files fetched: 1 STORED: http://search.cpan.org/CPAN/authors/id/S/SA/SARENNER/Net-IPAddress-1.10.tar.gz 512117d3f6bcc027bd11f70d71f6f844 Net-IPAddress-1.10.tar.gz Size: 3024 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/phpMyAdmin] - updated to 4.0.7
commit 31f3f428c7a82d5ccaf18cb5cae5f7d2213359d2 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Sep 30 14:50:22 2013 +0200 - updated to 4.0.7 phpMyAdmin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 5ef6243..90bf723 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -4,12 +4,12 @@ Summary: phpMyAdmin - web-based MySQL administration Summary(pl.UTF-8): phpMyAdmin - administracja bazami MySQL przez WWW Name: phpMyAdmin -Version: 4.0.6 +Version: 4.0.7 Release: 1 License: GPL v2 Group: Applications/Databases/Interfaces Source0: http://downloads.sourceforge.net/phpmyadmin/%{name}-%{version}-all-languages.tar.xz -# Source0-md5: 646795297032cc9d53fe9bee261919e5 +# Source0-md5: ba901d0da0475bd22e39ca34fbf06996 Source1: %{name}-apache.conf Source2: %{name}-lighttpd.conf Source3: %{name}-httpd.conf gitweb: http://git.pld-linux.org/gitweb.cgi/packages/phpMyAdmin.git/commitdiff/31f3f428c7a82d5ccaf18cb5cae5f7d2213359d2 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: phpMyAdmin: phpMyAdmin-4.0.7-all-languages.tar.xz
Files fetched: 1 STORED: http://downloads.sourceforge.net/phpmyadmin/phpMyAdmin-4.0.7-all-languages.tar.xz ba901d0da0475bd22e39ca34fbf06996 phpMyAdmin-4.0.7-all-languages.tar.xz Size: 4768812 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/owncloud] - removed SOURCE4 (httpd.conf) as not used since last commit
commit 43ee4ca45fa6349219e6b0adde6c5c8afeb932cf Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Jul 19 09:35:17 2013 +0200 - removed SOURCE4 (httpd.conf) as not used since last commit owncloud.spec | 2 -- 1 file changed, 2 deletions(-) --- diff --git a/owncloud.spec b/owncloud.spec index 34e823d..a26c57e 100644 --- a/owncloud.spec +++ b/owncloud.spec @@ -95,7 +95,6 @@ ln -s %{_sysconfdir}/config $RPM_BUILD_ROOT%{_appdir}/config cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config/config.php cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf -cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} @@ -126,7 +125,6 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING-AGPL COPYING-README README %dir %attr(750,root,http) %{_sysconfdir} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lighttpd.conf %dir %attr(750,http,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config %attr(640,http,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config/*.php gitweb: http://git.pld-linux.org/gitweb.cgi/packages/owncloud.git/commitdiff/43ee4ca45fa6349219e6b0adde6c5c8afeb932cf ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-IO-Interactive] Created branch master
The branch 'master' was created. Summary of new commits: 1e720fd... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-IO-Interactive] - initial
commit 1e720fdd097f8d57f52ad78543abc81052b5e177 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Mar 27 12:44:23 2013 +0100 - initial perl-IO-Interactive.spec | 57 1 file changed, 57 insertions(+) --- diff --git a/perl-IO-Interactive.spec b/perl-IO-Interactive.spec new file mode 100644 index 000..08d8385 --- /dev/null +++ b/perl-IO-Interactive.spec @@ -0,0 +1,57 @@ +# +# Conditional build: +%bcond_without tests # do not perform make test +# +%definepdirIO +%definepnamInteractive +%include /usr/lib/rpm/macros.perl +Summary: IO::Interactive - Utilities for interactive I/O +Name: perl-IO-Interactive +Version: 0.0.6 +Release: 1 +License: GPL v1+ or Artistic +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/IO/%{pdir}-%{pnam}-%{version}.tar.gz + Source0-md5: 6ca9b8b8afc8b7d5e85985ea864d2431 +URL: http://search.cpan.org/dist/IO-Interactive/ +BuildRequires: perl-devel = 1:5.8.0 +BuildRequires: rpm-perlprov = 4.1-13 +%if %{with tests} +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This module provides three utility subroutines that make it easier to +develop interactive applications... + + + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} pure_install \ + DESTDIR=$RPM_BUILD_ROOT + +install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/IO/*.pm +%{_mandir}/man3/* +%{_examplesdir}/%{name}-%{version} gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-IO-Interactive.git/commitdiff/1e720fdd097f8d57f52ad78543abc81052b5e177 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - updated to 3.2.2
commit 285d3dd3ecccd8bb811c4543a27e964d3a9f Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Mon Feb 25 13:26:40 2013 +0100 - updated to 3.2.2 otrs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index 87530fb..d145800 100644 --- a/otrs.spec +++ b/otrs.spec @@ -2,18 +2,18 @@ # - separate 3 subpackages: common files, administration and client frontend # - all otrs-var into /var/lib/otrs # - write not so brain-damage init-script... -# VERIFY rpm -qp .../foo.rpm --provides +# VERIFY rpm -qp .../foo.rpm --provides // DONE %include/usr/lib/rpm/macros.perl Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs -Version: 3.2.1 +Version: 3.2.2 Release: 0.1 Epoch: 1 License: GPL Group: Applications/Databases Source0: http://ftp.otrs.org/pub/otrs/%{name}-%{version}.tar.bz2 -# Source0-md5: 9f096d37d6c4842680962676ef32a2f7 +# Source0-md5: 31a402aa4352c7e1df10ca0a9aa578a2 Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/285d3dd3ecccd8bb811c4543a27e964d3a9f ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: otrs: otrs-3.2.2.tar.bz2
Files fetched: 1 STORED: http://ftp.otrs.org/pub/otrs/otrs-3.2.2.tar.bz2 31a402aa4352c7e1df10ca0a9aa578a2 otrs-3.2.2.tar.bz2 Size: 18221234 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - proper logfile location
commit b61e41dab00f31d9c7ef51a138f1802dbf085681 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 8 12:32:03 2013 +0100 - proper logfile location otrs-paths.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index 99697f7..6472cce 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -16,7 +16,7 @@ # param for LogModule Kernel::System::Log::File (required!) -$Self-{'LogModule::LogFile'} = '/tmp/otrs.log'; -+$Self-{'LogModule::LogFile'} = '/var/log/otrs.log'; ++$Self-{'LogModule::LogFile'} = '/var/log/otrs/otrs.log'; # param if the date (-mm) should be added as suffix to # logfile [0|1] @@ -45,7 +45,7 @@ SubGroupCore::Log/SubGroup Setting -String Regex=/tmp/otrs.log/String -+ String Regex=/usr/share/otrs.log/String ++ String Regex=/var/log/otrs/otrs.log/String /Setting /ConfigItem ConfigItem Name=LogModule::LogFile::Date Required=1 Valid=1 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/b61e41dab00f31d9c7ef51a138f1802dbf085681 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - added ZZZAuto.pm config
commit ac7b35d3d48cd39d7428c6aae160d9732f8d36a8 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 8 12:47:02 2013 +0100 - added ZZZAuto.pm config otrs.spec | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/otrs.spec b/otrs.spec index 033c609..87530fb 100644 --- a/otrs.spec +++ b/otrs.spec @@ -166,6 +166,8 @@ install $RPM_BUILD_ROOT/etc/%{name}/mailfilter $RPM_BUILD_ROOT/etc/%{name}/mailf install $RPM_BUILD_ROOT/etc/%{name}/Config.pm $RPM_BUILD_ROOT/etc/%{name}/Config.pm.dist install $RPM_BUILD_ROOT/etc/%{name}/GenericAgent.pm $RPM_BUILD_ROOT/etc/%{name}/GenericAgent.pm.dist # File for on-line configuration: +touch $RPM_BUILD_ROOT/etc/%{name}/ZZZAuto.pm +ln -sf ../../../../../../etc/otrs/ZZZAuto.pm $RPM_BUILD_ROOT%{otrsdir}/Kernel/Config/Files/ZZZAuto.pm touch $RPM_BUILD_ROOT/etc/%{name}/ZZZAAuto.pm ln -sf ../../../../../../etc/otrs/ZZZAAuto.pm $RPM_BUILD_ROOT%{otrsdir}/Kernel/Config/Files/ZZZAAuto.pm # link to proper places @@ -235,6 +237,7 @@ fi %attr(600,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mailfilter %attr(660,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/Config.pm %attr(640,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/GenericAgent.pm +%attr(660,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ZZZAuto.pm %attr(660,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ZZZAAuto.pm %attr(640,otrs,http) %{_sysconfdir}/%{name}/*.dist %attr(644,otrs,http) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/ac7b35d3d48cd39d7428c6aae160d9732f8d36a8 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - put TicketCounter.log in proper place
commit dac0ed281d848b21bf1051852373eac5d427104c Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 8 13:01:37 2013 +0100 - put TicketCounter.log in proper place otrs-paths.patch | 72 +--- 1 file changed, 42 insertions(+), 30 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index 6472cce..49928c6 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -1,5 +1,28 @@ +--- otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 otrs-3.2.1.new/bin/Cron.sh 2013-02-08 12:49:37.545377896 +0100 +@@ -45,16 +45,16 @@ + OTRS_HOME=`pwd` + cd - + +-#OTRS_ROOT=/opt/OpenTRS +-if test -e $OTRS_HOME/var/cron; then ++#OTRS_ROOT=/usr/share/otrs ++if test -e /etc/cron.d; then + OTRS_ROOT=$OTRS_HOME + else +-echo No cronjobs in $OTRS_HOME/var/cron found!; ++echo No cronjobs in /etc/cron.d found!; + echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /opt/otrs). ; + exit 5; + fi + +-CRON_DIR=$OTRS_ROOT/var/cron ++CRON_DIR=/etc/cron.d + CRON_TMP_FILE=$OTRS_ROOT/var/tmp/otrs-cron-tmp.$$ + + echo Cron.sh - start/stop OTRS cronjobs - \$Revision: 1.22 $ --- otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 -+++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-01-29 12:39:39.175799680 +0100 otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-02-08 12:49:37.538710921 +0100 @@ -82,7 +82,7 @@ [--not-root] OTRS_HOME @@ -10,7 +33,7 @@ if ( $#ARGV 0 ) { --- otrs-3.2.1/Kernel/Config/Defaults.pm 2013-01-17 10:06:52.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-01-29 12:40:37.118464479 +0100 otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-02-08 12:49:37.542044408 +0100 @@ -297,7 +297,7 @@ #$Self-{'LogModule::SysLog::Charset'} = 'utf-8'; @@ -39,7 +62,7 @@ #$Self-{'PGP::Options'} = '--batch --no-tty --yes'; #$Self-{'PGP::Key::Password'}-{'D2DF79FA'} = 1234; --- otrs-3.2.1/Kernel/Config/Files/Framework.xml 2013-01-03 10:12:36.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-01-29 12:41:09.689962451 +0100 otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-02-08 12:49:37.545377896 +0100 @@ -493,7 +493,7 @@ GroupFramework/Group SubGroupCore::Log/SubGroup @@ -58,8 +81,20 @@ /Setting /ConfigItem ConfigItem Name=PGP::Key::Password Required=1 Valid=1 +--- otrs-3.2.1/Kernel/Config/Files/Ticket.xml 2013-01-24 11:21:12.0 +0100 otrs-3.2.1.new/Kernel/Config/Files/Ticket.xml 2013-02-08 12:50:32.791264354 +0100 +@@ -215,7 +215,7 @@ + GroupTicket/Group + SubGroupCore::Ticket/SubGroup + Setting +-String Regex=lt;OTRS_CONFIG_Homegt;/var/log/TicketCounter.log/String ++ String Regex=/var/log/otrs/TicketCounter.log/String + /Setting + /ConfigItem + ConfigItem Name=Ticket::IndexModule Required=1 Valid=1 +Tylko w otrs-3.2.1.new/Kernel/Config/Files: Ticket.xml~ --- otrs-3.2.1/Kernel/Config.pm.dist 2012-11-22 12:43:05.0 +0100 -+++ otrs-3.2.1.new/Kernel/Config.pm.dist 2013-01-29 12:41:32.054324327 +0100 otrs-3.2.1.new/Kernel/Config.pm.dist 2013-02-08 12:49:37.545377896 +0100 @@ -63,7 +63,7 @@ # # # fs root directory @@ -70,7 +105,7 @@ # # # insert your own config settings here # --- otrs-3.2.1/scripts/apache2-httpd.include.conf 2013-01-17 10:06:55.0 +0100 -+++ otrs-3.2.1.new/scripts/apache2-httpd.include.conf 2013-01-29 12:42:41.307509300 +0100 otrs-3.2.1.new/scripts/apache2-httpd.include.conf 2013-02-08 12:49:37.545377896 +0100 @@ -3,8 +3,8 @@ # $Id: apache2-httpd.include.conf,v 1.27 2013/01/04 13:03:06 mg Exp $ # -- @@ -126,7 +161,7 @@ Header set Cache-Control max-age=2592000 must-revalidate /FilesMatch --- otrs-3.2.1/scripts/apache2-perl-startup.pl 2013-01-24 11:21:14.0 +0100 -+++ otrs-3.2.1.new/scripts/apache2-perl-startup.pl 2013-01-29 12:43:07.268703262 +0100 otrs-3.2.1.new/scripts/apache2-perl-startup.pl 2013-02-08 12:49:37.545377896 +0100 @@ -35,15 +35,15 @@ # set $0 to index.pl because this is broken in mod_perl context; # apart from that, on Fedora, $0 is not a path which would break OTRS. @@ -148,7 +183,7 @@ # Preload frequently used modules to speed up client spawning. use CGI (); --- otrs-3.2.1/scripts/redhat-rcotrs-config2012-10-11 09:11:09.0 +0200 -+++ otrs-3.2.1.new/scripts/redhat-rcotrs-config2013-01-29 12:43:27.239621730 +0100 otrs-3.2.1.new/scripts/redhat-rcotrs-config2013-02-08 12:49:37.545377896 +0100 @@ -12,7 +12,7 @@ # # OTRS home (root) directory @@ -158,26 +193,3 @@
[packages/dokuwiki-plugin-recaptcha] Created branch master
The branch 'master' was created. Summary of new commits: 9018e84... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-recaptcha] - initial
commit 9018e84577e7fbb93bec92e5f067b5f4e5562797 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Feb 7 12:37:53 2013 +0100 - initial dokuwiki-plugin-recaptcha.spec | 55 ++ 1 file changed, 55 insertions(+) --- diff --git a/dokuwiki-plugin-recaptcha.spec b/dokuwiki-plugin-recaptcha.spec new file mode 100644 index 000..c704d82 --- /dev/null +++ b/dokuwiki-plugin-recaptcha.spec @@ -0,0 +1,55 @@ +%defineplugin recaptcha +Summary: DokuWiki reCAPTCHA Plugin +Summary(pl.UTF-8): Wtyczka recaptcha dla DokuWiki +Name: dokuwiki-plugin-%{plugin} +Version: 0.2 +Release: 1 +License: GPL v2 +Group: Applications/WWW +Source0: https://fosswiki.liip.ch/download/attachments/8224780/recaptcha_v0.2.tgz +# Source0-md5: 9fc3ae744ed2a0a81872b7d36798dfb1 +URL: http://www.dokuwiki.org/plugin:recaptcha +Requires: dokuwiki = 20061106 +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%definedokuconf/etc/webapps/dokuwiki +%definedokudir /usr/share/dokuwiki +%defineplugindir %{dokudir}/lib/plugins/%{plugin} + +%description +Lists all pages that link back to a given page using the first +headline as link title. + +%prep +%setup -q -n %{plugin} + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{plugindir} +cp -a . $RPM_BUILD_ROOT%{plugindir} +rm -f $RPM_BUILD_ROOT%{plugindir}/info.txt + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +# force css cache refresh +if [ -f %{dokuconf}/local.php ]; then + touch %{dokuconf}/local.php +fi + +%files +%defattr(644,root,root,755) +%doc info.txt +%dir %{plugindir} +%{plugindir}/*.php +%dir %{plugindir}/conf +%{plugindir}/conf/*.php +%dir %{plugindir}/lang +%dir %{plugindir}/lang/en +%{plugindir}/lang/en/*.php +%dir %{plugindir}/lang/de +%{plugindir}/lang/de/*.php +%dir %{plugindir}/lib +%{plugindir}/lib/*.php gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-recaptcha.git/commitdiff/9018e84577e7fbb93bec92e5f067b5f4e5562797 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dokuwiki-plugin-recaptcha: recaptcha_v0.2.tgz
Files fetched: 1 STORED: https://fosswiki.liip.ch/download/attachments/8224780/recaptcha_v0.2.tgz 9fc3ae744ed2a0a81872b7d36798dfb1 recaptcha_v0.2.tgz Size: 6931 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-recaptcha] - use php-recaptcha
commit c06d07c30af05aacb154454047d4debeef23816b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Feb 7 14:57:55 2013 +0100 - use php-recaptcha dokuwiki-plugin-recaptcha.spec | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) --- diff --git a/dokuwiki-plugin-recaptcha.spec b/dokuwiki-plugin-recaptcha.spec index c704d82..04356df 100644 --- a/dokuwiki-plugin-recaptcha.spec +++ b/dokuwiki-plugin-recaptcha.spec @@ -10,6 +10,7 @@ Source0: https://fosswiki.liip.ch/download/attachments/8224780/recaptcha_v0.2.tg # Source0-md5: 9fc3ae744ed2a0a81872b7d36798dfb1 URL: http://www.dokuwiki.org/plugin:recaptcha Requires: dokuwiki = 20061106 +Requires: php-recaptcha BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -33,12 +34,6 @@ rm -f $RPM_BUILD_ROOT%{plugindir}/info.txt %clean rm -rf $RPM_BUILD_ROOT -%post -# force css cache refresh -if [ -f %{dokuconf}/local.php ]; then - touch %{dokuconf}/local.php -fi - %files %defattr(644,root,root,755) %doc info.txt @@ -51,5 +46,3 @@ fi %{plugindir}/lang/en/*.php %dir %{plugindir}/lang/de %{plugindir}/lang/de/*.php -%dir %{plugindir}/lib -%{plugindir}/lib/*.php gitweb: http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-recaptcha.git/commitdiff/c06d07c30af05aacb154454047d4debeef23816b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - fixed crontab
commit 6350bf716eede1b7f61569d6dd3b2065e1f07e2e Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Feb 1 15:36:11 2013 +0100 - fixed crontab otrs-paths.patch | 20 ++-- otrs.spec| 1 - 2 files changed, 10 insertions(+), 11 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index b804e8d..033c609 100644 --- a/otrs.spec +++ b/otrs.spec @@ -402,7 +402,6 @@ fi # This entries should be changed into links and proper trigger to move data: %attr(751,otrs,http) %dir %{otrsdir}/var/ %{otrsdir}/var/*.png -%attr(755,otrs,http) %dir /etc/cron.d %attr(2775,otrs,http) %{otrsdir}/var/article %attr(755,otrs,http) %{otrsdir}/var/fonts %attr(755,otrs,http) %{otrsdir}/var/httpd diff --git a/otrs-paths.patch b/otrs-paths.patch index 4477e53..99697f7 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -158,26 +158,26 @@ # if one of this is false, it will not be checked at the startup! # Note: (may be the database isn't on the same host! -- DB_RUNNING=0) otrs-3.2.1.new/bin/Cron.sh 2013-01-31 09:29:55.308734799 +0100 -+++ otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 +--- otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 otrs-3.2.1.new/bin/Cron.sh 2013-01-31 09:29:55.308734799 +0100 @@ -45,16 +45,16 @@ OTRS_HOME=`pwd` cd - --#OTRS_ROOT=/usr/share/otrs --if test -e /etc/cron.d; then -+#OTRS_ROOT=/opt/OpenTRS -+if test -e $OTRS_HOME/var/cron; then +-#OTRS_ROOT=/opt/OpenTRS +-if test -e $OTRS_HOME/var/cron; then ++#OTRS_ROOT=/usr/share/otrs ++if test -e /etc/cron.d; then OTRS_ROOT=$OTRS_HOME else --echo No cronjobs in /etc/cron.d found!; -+echo No cronjobs in $OTRS_HOME/var/cron found!; +-echo No cronjobs in $OTRS_HOME/var/cron found!; ++echo No cronjobs in /etc/cron.d found!; echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /opt/otrs). ; exit 5; fi --CRON_DIR=/etc/cron.d -+CRON_DIR=$OTRS_ROOT/var/cron +-CRON_DIR=$OTRS_ROOT/var/cron ++CRON_DIR=/etc/cron.d CRON_TMP_FILE=$OTRS_ROOT/var/tmp/otrs-cron-tmp.$$ echo Cron.sh - start/stop OTRS cronjobs - \$Revision: 1.22 $ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/6350bf716eede1b7f61569d6dd3b2065e1f07e2e ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - moved cron files to proper place
commit 14be7800fffe3dc08a56c9501774967fb9d5ca73 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 09:31:54 2013 +0100 - moved cron files to proper place otrs-paths.patch | 34 +++--- otrs.spec| 12 ++-- 2 files changed, 29 insertions(+), 17 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index 96d0bcf..b804e8d 100644 --- a/otrs.spec +++ b/otrs.spec @@ -1,7 +1,6 @@ # TODO: # - separate 3 subpackages: common files, administration and client frontend # - all otrs-var into /var/lib/otrs -# - put cron in proper place # - write not so brain-damage init-script... # VERIFY rpm -qp .../foo.rpm --provides %include/usr/lib/rpm/macros.perl @@ -121,8 +120,6 @@ Różne skrypty dla OTRS. # copy config file cp Kernel/Config/GenericAgent.pm.dist Kernel/Config/GenericAgent.pm cd Kernel/Config/ for foo in *.dist; do cp $foo `basename $foo .dist`; done cd ../../ -# copy all crontab dist files -for foo in var/cron/*.dist; do mv $foo var/cron/`basename $foo .dist`; done # Remove regular CPAN libs - only HTML/Safe.pm has to stay, I can't find it... rm -Rf Kernel/cpan-lib/{Authen,Date,Email,IO,MIME,Mail,XML,auto} @@ -132,7 +129,7 @@ rm -Rf doc/manual/de/ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,%{name}/Config,logrotate.d} \ +install -d $RPM_BUILD_ROOT/etc/{cron.d,logrotate.d,rc.d/init.d,sysconfig,%{name}/Config,logrotate.d} \ $RPM_BUILD_ROOT{/var/log/{,archive/}%{name},%{_bindir},%{otrsdir}} \ $RPM_BUILD_ROOT/var/lib/%{name}/{article,pics/stats} \ $RPM_BUILD_ROOT%{_webapps}/%{_webapp} @@ -140,6 +137,9 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,%{name}/Config # copy files cp -R . $RPM_BUILD_ROOT%{otrsdir} +# copy all crontab dist files +for foo in var/cron/*.dist; do mv $foo $RPM_BUILD_ROOT/etc/cron.d/otrs.`basename $foo` ; done + # install init-Script apache2 config install scripts/redhat-rcotrs $RPM_BUILD_ROOT/etc/rc.d/init.d/otrs install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/otrs @@ -237,7 +237,7 @@ fi %attr(640,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/GenericAgent.pm %attr(660,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/ZZZAAuto.pm %attr(640,otrs,http) %{_sysconfdir}/%{name}/*.dist -%attr(644,otrs,http) %config(noreplace) %verify(not md5 mtime size) %{otrsdir}/var/cron/* +%attr(644,otrs,http) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/* %attr(754,root,root) /etc/rc.d/init.d/%{name} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name} %attr(755,otrs,http) %dir %{otrsdir} @@ -402,7 +402,7 @@ fi # This entries should be changed into links and proper trigger to move data: %attr(751,otrs,http) %dir %{otrsdir}/var/ %{otrsdir}/var/*.png -%attr(755,otrs,http) %dir %{otrsdir}/var/cron +%attr(755,otrs,http) %dir /etc/cron.d %attr(2775,otrs,http) %{otrsdir}/var/article %attr(755,otrs,http) %{otrsdir}/var/fonts %attr(755,otrs,http) %{otrsdir}/var/httpd diff --git a/otrs-paths.patch b/otrs-paths.patch index c98469d..4477e53 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -1,14 +1,3 @@ otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 -+++ otrs-3.2.1.new/bin/Cron.sh 2013-01-29 12:39:20.521608435 +0100 -@@ -45,7 +45,7 @@ - OTRS_HOME=`pwd` - cd - - --#OTRS_ROOT=/opt/OpenTRS -+#OTRS_ROOT=/usr/share/otrs - if test -e $OTRS_HOME/var/cron; then - OTRS_ROOT=$OTRS_HOME - else --- otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 +++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-01-29 12:39:39.175799680 +0100 @@ -82,7 +82,7 @@ @@ -169,3 +158,26 @@ # if one of this is false, it will not be checked at the startup! # Note: (may be the database isn't on the same host! -- DB_RUNNING=0) +--- otrs-3.2.1.new/bin/Cron.sh 2013-01-31 09:29:55.308734799 +0100 otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 +@@ -45,16 +45,16 @@ + OTRS_HOME=`pwd` + cd - + +-#OTRS_ROOT=/usr/share/otrs +-if test -e /etc/cron.d; then ++#OTRS_ROOT=/opt/OpenTRS ++if test -e $OTRS_HOME/var/cron; then + OTRS_ROOT=$OTRS_HOME + else +-echo No cronjobs in /etc/cron.d found!; ++echo No cronjobs in $OTRS_HOME/var/cron found!; + echo * Check the \$HOME (/etc/passwd) of the OTRS user. It must be the root dir of your OTRS system (e. g. /opt/otrs). ; + exit 5; + fi + +-CRON_DIR=/etc/cron.d ++CRON_DIR=$OTRS_ROOT/var/cron + CRON_TMP_FILE=$OTRS_ROOT/var/tmp/otrs-cron-tmp.$$ + + echo Cron.sh - start/stop OTRS cronjobs - \$Revision: 1.22 $ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/14be7800fffe3dc08a56c9501774967fb9d5ca73 ___ pld-cvs-commit mailing list
[packages/perl-CSS-Minifier] Created branch master
The branch 'master' was created. Summary of new commits: 7522a3b... - initial ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-CSS-Minifier] - initial
commit 7522a3bc3ba7b2e006976c99410df71f6e02b42b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 10:27:36 2013 +0100 - initial perl-CSS-Minifier.spec | 65 ++ 1 file changed, 65 insertions(+) --- diff --git a/perl-CSS-Minifier.spec b/perl-CSS-Minifier.spec new file mode 100644 index 000..9932433 --- /dev/null +++ b/perl-CSS-Minifier.spec @@ -0,0 +1,65 @@ +# $Revision:$, $Date:$ +# +# Conditional build: +%bcond_without tests # do not perform make test +# +%definepdirCSS +%definepnamMinifier +%include /usr/lib/rpm/macros.perl +Summary: CSS::Minifier - Perl extension for minifying CSS +Name: perl-CSS-Minifier +Version: 0.01 +Release: 1 +License: unknown +Group: Development/Languages/Perl +Source0: http://www.cpan.org/modules/by-module/CSS/%{pdir}-%{pnam}-%{version}.tar.gz +# Source0-md5: 04f64c08c9268fd0fc619ef8110d2cf4 +URL: http://search.cpan.org/dist/CSS-Minifier/ +BuildRequires: perl-devel = 1:5.8.0 +BuildRequires: rpm-perlprov = 4.1-13 +%if %{with tests} +%endif +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +This module removes unnecessary whitespace from CSS. The primary +requirement developing this module is to not break working +stylesheets: if working CSS is in input then working CSS is output. +The Mac/Internet Explorer comment hack will be minimized but not +stripped and so will continue to function. + +This module understands space, horizontal tab, new line, carriage +return, and form feed characters to be whitespace. Any other +characters that may be considered whitespace are not minimized. These +other characters include paragraph separator and vertical tab. + +For static CSS files, it is recommended that you minify during the +build stage of web deployment. If you minify on-the-fly then it might +be a good idea to cache the minified file. Minifying static files +on-the-fly repeatedly is wasteful. + +%prep +%setup -q -n %{pdir}-%{pnam}-%{version} + +%build +%{__perl} Makefile.PL \ + INSTALLDIRS=vendor +%{__make} + +%{?with_tests:%{__make} test} + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} pure_install \ + DESTDIR=$RPM_BUILD_ROOT + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(644,root,root,755) +%doc Changes README +%{perl_vendorlib}/CSS/Minifier.pm +%{_mandir}/man3/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-CSS-Minifier.git/commitdiff/7522a3bc3ba7b2e006976c99410df71f6e02b42b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-CSS-Minifier: CSS-Minifier-0.01.tar.gz
Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/CSS/CSS-Minifier-0.01.tar.gz 04f64c08c9268fd0fc619ef8110d2cf4 CSS-Minifier-0.01.tar.gz Size: 5260 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Locale-Codes] - updated to 3.24
commit 357bc0464f6b977af6ef934f59515e7ef0c6cbb9 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 10:48:37 2013 +0100 - updated to 3.24 perl-Locale-Codes.spec | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) --- diff --git a/perl-Locale-Codes.spec b/perl-Locale-Codes.spec index 53e834e..bb4decb 100644 --- a/perl-Locale-Codes.spec +++ b/perl-Locale-Codes.spec @@ -23,13 +23,13 @@ Summary(sv.UTF-8): Locale::Codes Perlmodul Summary(uk.UTF-8): Модуль для Perl Locale::Codes Summary(zh_CN.UTF-8): Locale::Codes Perl 模块 Name: perl-Locale-Codes -Version: 2.07 -Release: 2 +Version: 3.24 +Release: 1 # same as perl License: GPL v1+ or Artistic Group: Development/Languages/Perl Source0: http://www.cpan.org/modules/by-module/%{pdir}/%{pdir}-%{pnam}-%{version}.tar.gz -# Source0-md5: af0537cc4a882096d0320612c440df6d +# Source0-md5: a49f770d424b634a0c9726a8202984a8 BuildRequires: perl-devel = 1:5.8.0 BuildRequires: rpm-perlprov = 4.1-13 BuildArch: noarch @@ -66,4 +66,5 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog README %{perl_vendorlib}/Locale/*.pm +%{perl_vendorlib}/Locale/Codes/*.pm %{_mandir}/man3/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-Locale-Codes.git/commitdiff/357bc0464f6b977af6ef934f59515e7ef0c6cbb9 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: perl-Locale-Codes: Locale-Codes-3.24.tar.gz
Files fetched: 1 STORED: http://www.cpan.org/modules/by-module/Locale/Locale-Codes-3.24.tar.gz a49f770d424b634a0c9726a8202984a8 Locale-Codes-3.24.tar.gz Size: 776296 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/perl-Locale-Codes] - added missing dir; rel 2
commit 20398101291c5ba7654bc6bb77b8800db4daa395 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 10:51:29 2013 +0100 - added missing dir; rel 2 perl-Locale-Codes.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- diff --git a/perl-Locale-Codes.spec b/perl-Locale-Codes.spec index bb4decb..0aa8e9b 100644 --- a/perl-Locale-Codes.spec +++ b/perl-Locale-Codes.spec @@ -24,7 +24,7 @@ Summary(uk.UTF-8):Модуль для Perl Locale::Codes Summary(zh_CN.UTF-8): Locale::Codes Perl 模块 Name: perl-Locale-Codes Version: 3.24 -Release: 1 +Release: 2 # same as perl License: GPL v1+ or Artistic Group: Development/Languages/Perl @@ -66,5 +66,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %doc ChangeLog README %{perl_vendorlib}/Locale/*.pm +%dir %{perl_vendorlib}/Locale/Codes %{perl_vendorlib}/Locale/Codes/*.pm %{_mandir}/man3/* gitweb: http://git.pld-linux.org/gitweb.cgi/packages/perl-Locale-Codes.git/commitdiff/20398101291c5ba7654bc6bb77b8800db4daa395 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - since there is no more wrong Provides rel 1
commit f106984fe52e95aeb64883e295dbc38ce7c17eda Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 10:55:54 2013 +0100 - since there is no more wrong Provides rel 1 otrs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/otrs.spec b/otrs.spec index b804e8d..4bb8faa 100644 --- a/otrs.spec +++ b/otrs.spec @@ -8,7 +8,7 @@ Summary:The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs Version: 3.2.1 -Release: 0.1 +Release: 1 Epoch: 1 License: GPL Group: Applications/Databases gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/f106984fe52e95aeb64883e295dbc38ce7c17eda ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - used pclean on this patch
commit d9cf4e806e241f2f2c13cea065ac13d1cb04878a Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jan 30 12:16:54 2013 +0100 - used pclean on this patch otrs-paths.patch | 8 1 file changed, 8 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index 74cf1b5..b8fdae4 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -1,4 +1,3 @@ -diff -ur otrs-3.2.1/bin/Cron.sh otrs-3.2.1.new/bin/Cron.sh --- otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 +++ otrs-3.2.1.new/bin/Cron.sh 2013-01-29 12:39:20.521608435 +0100 @@ -45,7 +45,7 @@ @@ -11,7 +10,6 @@ diff -ur otrs-3.2.1/bin/Cron.sh otrs-3.2.1.new/bin/Cron.sh OTRS_ROOT=$OTRS_HOME else Tylko w otrs-3.2.1.new/bin: Cron.sh~ -diff -ur otrs-3.2.1/bin/otrs.SetPermissions.pl otrs-3.2.1.new/bin/otrs.SetPermissions.pl --- otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 +++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-01-29 12:39:39.175799680 +0100 @@ -82,7 +82,7 @@ @@ -24,7 +22,6 @@ diff -ur otrs-3.2.1/bin/otrs.SetPermissions.pl otrs-3.2.1.new/bin/otrs.SetPermis if ( $#ARGV 0 ) { Tylko w otrs-3.2.1.new/bin: otrs.SetPermissions.pl~ -diff -ur otrs-3.2.1/Kernel/Config/Defaults.pm otrs-3.2.1.new/Kernel/Config/Defaults.pm --- otrs-3.2.1/Kernel/Config/Defaults.pm 2013-01-17 10:06:52.0 +0100 +++ otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-01-29 12:40:37.118464479 +0100 @@ -297,7 +297,7 @@ @@ -55,7 +52,6 @@ diff -ur otrs-3.2.1/Kernel/Config/Defaults.pm otrs-3.2.1.new/Kernel/Config/Defau #$Self-{'PGP::Options'} = '--batch --no-tty --yes'; #$Self-{'PGP::Key::Password'}-{'D2DF79FA'} = 1234; Tylko w otrs-3.2.1.new/Kernel/Config: Defaults.pm~ -diff -ur otrs-3.2.1/Kernel/Config/Files/Framework.xml otrs-3.2.1.new/Kernel/Config/Files/Framework.xml --- otrs-3.2.1/Kernel/Config/Files/Framework.xml 2013-01-03 10:12:36.0 +0100 +++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-01-29 12:41:09.689962451 +0100 @@ -493,7 +493,7 @@ @@ -77,7 +73,6 @@ diff -ur otrs-3.2.1/Kernel/Config/Files/Framework.xml otrs-3.2.1.new/Kernel/Conf /ConfigItem ConfigItem Name=PGP::Key::Password Required=1 Valid=1 Tylko w otrs-3.2.1.new/Kernel/Config/Files: Framework.xml~ -diff -ur otrs-3.2.1/Kernel/Config.pm.dist otrs-3.2.1.new/Kernel/Config.pm.dist --- otrs-3.2.1/Kernel/Config.pm.dist 2012-11-22 12:43:05.0 +0100 +++ otrs-3.2.1.new/Kernel/Config.pm.dist 2013-01-29 12:41:32.054324327 +0100 @@ -63,7 +63,7 @@ @@ -90,7 +85,6 @@ diff -ur otrs-3.2.1/Kernel/Config.pm.dist otrs-3.2.1.new/Kernel/Config.pm.dist # # # insert your own config settings here # Tylko w otrs-3.2.1.new/Kernel: Config.pm.dist~ -diff -ur otrs-3.2.1/scripts/apache2-httpd.include.conf otrs-3.2.1.new/scripts/apache2-httpd.include.conf --- otrs-3.2.1/scripts/apache2-httpd.include.conf 2013-01-17 10:06:55.0 +0100 +++ otrs-3.2.1.new/scripts/apache2-httpd.include.conf 2013-01-29 12:42:41.307509300 +0100 @@ -3,8 +3,8 @@ @@ -148,7 +142,6 @@ diff -ur otrs-3.2.1/scripts/apache2-httpd.include.conf otrs-3.2.1.new/scripts/ap Header set Cache-Control max-age=2592000 must-revalidate /FilesMatch Tylko w otrs-3.2.1.new/scripts: apache2-httpd.include.conf~ -diff -ur otrs-3.2.1/scripts/apache2-perl-startup.pl otrs-3.2.1.new/scripts/apache2-perl-startup.pl --- otrs-3.2.1/scripts/apache2-perl-startup.pl 2013-01-24 11:21:14.0 +0100 +++ otrs-3.2.1.new/scripts/apache2-perl-startup.pl 2013-01-29 12:43:07.268703262 +0100 @@ -35,15 +35,15 @@ @@ -172,7 +165,6 @@ diff -ur otrs-3.2.1/scripts/apache2-perl-startup.pl otrs-3.2.1.new/scripts/apach # Preload frequently used modules to speed up client spawning. use CGI (); Tylko w otrs-3.2.1.new/scripts: apache2-perl-startup.pl~ -diff -ur otrs-3.2.1/scripts/redhat-rcotrs-config otrs-3.2.1.new/scripts/redhat-rcotrs-config --- otrs-3.2.1/scripts/redhat-rcotrs-config2012-10-11 09:11:09.0 +0200 +++ otrs-3.2.1.new/scripts/redhat-rcotrs-config2013-01-29 12:43:27.239621730 +0100 @@ -12,7 +12,7 @@ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/d9cf4e806e241f2f2c13cea065ac13d1cb04878a ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - removed PL junk
commit 94cb050c2c32a6624d3b3c74678712969f3f018c Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jan 30 12:36:01 2013 +0100 - removed PL junk otrs-paths.patch | 8 1 file changed, 8 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index b8fdae4..c98469d 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -9,7 +9,6 @@ if test -e $OTRS_HOME/var/cron; then OTRS_ROOT=$OTRS_HOME else -Tylko w otrs-3.2.1.new/bin: Cron.sh~ --- otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 +++ otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-01-29 12:39:39.175799680 +0100 @@ -82,7 +82,7 @@ @@ -21,7 +20,6 @@ Tylko w otrs-3.2.1.new/bin: Cron.sh~ EOF if ( $#ARGV 0 ) { -Tylko w otrs-3.2.1.new/bin: otrs.SetPermissions.pl~ --- otrs-3.2.1/Kernel/Config/Defaults.pm 2013-01-17 10:06:52.0 +0100 +++ otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-01-29 12:40:37.118464479 +0100 @@ -297,7 +297,7 @@ @@ -51,7 +49,6 @@ Tylko w otrs-3.2.1.new/bin: otrs.SetPermissions.pl~ #$Self-{'PGP::Options'} = '--batch --no-tty --yes'; #$Self-{'PGP::Key::Password'}-{'D2DF79FA'} = 1234; -Tylko w otrs-3.2.1.new/Kernel/Config: Defaults.pm~ --- otrs-3.2.1/Kernel/Config/Files/Framework.xml 2013-01-03 10:12:36.0 +0100 +++ otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-01-29 12:41:09.689962451 +0100 @@ -493,7 +493,7 @@ @@ -72,7 +69,6 @@ Tylko w otrs-3.2.1.new/Kernel/Config: Defaults.pm~ /Setting /ConfigItem ConfigItem Name=PGP::Key::Password Required=1 Valid=1 -Tylko w otrs-3.2.1.new/Kernel/Config/Files: Framework.xml~ --- otrs-3.2.1/Kernel/Config.pm.dist 2012-11-22 12:43:05.0 +0100 +++ otrs-3.2.1.new/Kernel/Config.pm.dist 2013-01-29 12:41:32.054324327 +0100 @@ -63,7 +63,7 @@ @@ -84,7 +80,6 @@ Tylko w otrs-3.2.1.new/Kernel/Config/Files: Framework.xml~ # # # insert your own config settings here # -Tylko w otrs-3.2.1.new/Kernel: Config.pm.dist~ --- otrs-3.2.1/scripts/apache2-httpd.include.conf 2013-01-17 10:06:55.0 +0100 +++ otrs-3.2.1.new/scripts/apache2-httpd.include.conf 2013-01-29 12:42:41.307509300 +0100 @@ -3,8 +3,8 @@ @@ -141,7 +136,6 @@ Tylko w otrs-3.2.1.new/Kernel: Config.pm.dist~ FilesMatch \.(js|JS)$ Header set Cache-Control max-age=2592000 must-revalidate /FilesMatch -Tylko w otrs-3.2.1.new/scripts: apache2-httpd.include.conf~ --- otrs-3.2.1/scripts/apache2-perl-startup.pl 2013-01-24 11:21:14.0 +0100 +++ otrs-3.2.1.new/scripts/apache2-perl-startup.pl 2013-01-29 12:43:07.268703262 +0100 @@ -35,15 +35,15 @@ @@ -164,7 +158,6 @@ Tylko w otrs-3.2.1.new/scripts: apache2-httpd.include.conf~ # Preload frequently used modules to speed up client spawning. use CGI (); -Tylko w otrs-3.2.1.new/scripts: apache2-perl-startup.pl~ --- otrs-3.2.1/scripts/redhat-rcotrs-config2012-10-11 09:11:09.0 +0200 +++ otrs-3.2.1.new/scripts/redhat-rcotrs-config2013-01-29 12:43:27.239621730 +0100 @@ -12,7 +12,7 @@ @@ -176,4 +169,3 @@ Tylko w otrs-3.2.1.new/scripts: apache2-perl-startup.pl~ # if one of this is false, it will not be checked at the startup! # Note: (may be the database isn't on the same host! -- DB_RUNNING=0) -Tylko w otrs-3.2.1.new/scripts: redhat-rcotrs-config~ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/94cb050c2c32a6624d3b3c74678712969f3f018c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/rpm-build-tools] - added Tylko to pclean alias
commit 5943c926de95658c06d061542707a12480f2dd24 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jan 30 12:37:19 2013 +0100 - added Tylko to pclean alias shrc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/shrc.sh b/shrc.sh index 1c39f00..dd2435e 100755 --- a/shrc.sh +++ b/shrc.sh @@ -192,7 +192,7 @@ get-buildlog() { fi # no $dist set alias adif=dif -x '*.m4' -x ltmain.sh -x install-sh -x depcomp -x 'Makefile.in' -x compile -x 'config.*' -x configure -x missing -x mkinstalldirs -x autom4te.cache -alias pclean=sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Files\|Common\|Index:\|RCS file\|retrieving\)/d' +alias pclean=sed -i~ -e '/^\(?\|=\+$\|unchanged:\|diff\|only\|Only\|Tylko\|Files\|Common\|Index:\|RCS file\|retrieving\)/d' # makes diff from PLD CVS urls # requires: cvs, tee gitweb: http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/5943c926de95658c06d061542707a12480f2dd24 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - added noautoprov for perl-HTTP
commit 303f4824e6b83fb5d44cdab53027cfbcc83a5e72 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jan 30 14:06:55 2013 +0100 - added noautoprov for perl-HTTP otrs.spec | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index 8e7c755..24d851a 100644 --- a/otrs.spec +++ b/otrs.spec @@ -3,20 +3,13 @@ # - all otrs-var into /var/lib/otrs # - put cron in proper place # - write not so brain-damage init-script... -# - do not provide system perl deps (reason for build blocker) -# perl-MailTools-2.08-1.noarch: required perl(Net::SMTP::SSL) is provided by the following packages: -# a) otrs-3.1.11-1.noarch -# b) perl-Net-SMTP-SSL-1.01-1.noarch -# perl-libwww-6.03-1.noarch: required perl(HTTP::Status) is provided by the following packages: -# a) otrs-3.1.11-1.noarch -# b) perl-HTTP-Message-6.02-1.noarch # VERIFY rpm -qp .../foo.rpm --provides %include /usr/lib/rpm/macros.perl Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs Version: 3.2.1 -Release: 1 +Release: 0.1 Epoch: 1 License: GPL Group: Applications/Databases @@ -26,7 +19,6 @@ Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch URL: http://otrs.org/ -BuildRequires: FIX_TODO_DO_NOT_SEND_TO_TH BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) = 1.268 Requires(pre): /bin/id @@ -50,7 +42,7 @@ BuildArch:noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_noautoreq 'perl\\(Kernel::.*\\)' -%define_noautoprov 'perl\\(Kernel::.*\\)' 'perl\\(YAML::.*\\)' 'perl\\(Net::.*\\)' +%define_noautoprov 'perl\\(Kernel::.*\\)' 'perl\\(YAML::.*\\)' 'perl\\(Net::.*\\)' 'perl\\(HTTP::.*\\)' %defineotrsdir %{_datadir}/otrs %defineotrsuserotrs gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/303f4824e6b83fb5d44cdab53027cfbcc83a5e72 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - switched to new macros
commit d1636bf5ce2f82a4cf9e6e6d710a1be67b988c55 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Wed Jan 30 14:42:30 2013 +0100 - switched to new macros otrs.spec | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index 24d851a..b7ab4e5 100644 --- a/otrs.spec +++ b/otrs.spec @@ -4,7 +4,7 @@ # - put cron in proper place # - write not so brain-damage init-script... # VERIFY rpm -qp .../foo.rpm --provides -%include /usr/lib/rpm/macros.perl +%{load:/usr/lib/rpm/macros.d/perl} Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs @@ -20,7 +20,7 @@ Source2: %{name}.sysconfig Patch0:%{name}-paths.patch URL: http://otrs.org/ BuildRequires: rpm-perlprov -BuildRequires: rpmbuild(macros) = 1.268 +BuildRequires: rpmbuild(macros) = 1.654 Requires(pre): /bin/id Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod @@ -41,8 +41,8 @@ Conflicts:logrotate 3.7-4 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define_noautoreq 'perl\\(Kernel::.*\\)' -%define_noautoprov 'perl\\(Kernel::.*\\)' 'perl\\(YAML::.*\\)' 'perl\\(Net::.*\\)' 'perl\\(HTTP::.*\\)' +%define_noautoreq_perl Kernel::.* +%define_noautoprov 'perl\\(Kernel::.*\\)' 'perl\\(YAML::.*\\)' 'perl\\(Net::.*\\)' 'perl\\(HTTP::.*\\)' %defineotrsdir %{_datadir}/otrs %defineotrsuserotrs gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/d1636bf5ce2f82a4cf9e6e6d710a1be67b988c55 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - added _noautoprovfiles
commit 30acb9b9529b226aad4bdffeaa103299ca6fb78c Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Thu Jan 31 08:55:57 2013 +0100 - added _noautoprovfiles otrs.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index b7ab4e5..96d0bcf 100644 --- a/otrs.spec +++ b/otrs.spec @@ -4,7 +4,7 @@ # - put cron in proper place # - write not so brain-damage init-script... # VERIFY rpm -qp .../foo.rpm --provides -%{load:/usr/lib/rpm/macros.d/perl} +%include/usr/lib/rpm/macros.perl Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs @@ -42,7 +42,7 @@ BuildArch:noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define_noautoreq_perl Kernel::.* -%define_noautoprov 'perl\\(Kernel::.*\\)' 'perl\\(YAML::.*\\)' 'perl\\(Net::.*\\)' 'perl\\(HTTP::.*\\)' +%define_noautoprovfiles%{otrsdir}/Kernel/cpan-lib/ %defineotrsdir %{_datadir}/otrs %defineotrsuserotrs gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/30acb9b9529b226aad4bdffeaa103299ca6fb78c ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - updated for 3.2.1
commit 7ec23434ee4bb04b658a6ae77153833d31f9bd23 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Jan 29 13:03:11 2013 +0100 - updated for 3.2.1 otrs-paths.patch | 111 --- 1 file changed, 64 insertions(+), 47 deletions(-) --- diff --git a/otrs-paths.patch b/otrs-paths.patch index f9a0322..74cf1b5 100644 --- a/otrs-paths.patch +++ b/otrs-paths.patch @@ -1,6 +1,6 @@ -diff -ur otrs-3.0.11/bin/Cron.sh otrs-3.0.11.new//bin/Cron.sh otrs-3.0.11/bin/Cron.sh2011-10-11 14:01:44.0 +0200 -+++ otrs-3.0.11.new//bin/Cron.sh 2011-11-04 09:11:31.296872990 +0100 +diff -ur otrs-3.2.1/bin/Cron.sh otrs-3.2.1.new/bin/Cron.sh +--- otrs-3.2.1/bin/Cron.sh 2012-11-22 12:43:09.0 +0100 otrs-3.2.1.new/bin/Cron.sh 2013-01-29 12:39:20.521608435 +0100 @@ -45,7 +45,7 @@ OTRS_HOME=`pwd` cd - @@ -10,10 +10,11 @@ diff -ur otrs-3.0.11/bin/Cron.sh otrs-3.0.11.new//bin/Cron.sh if test -e $OTRS_HOME/var/cron; then OTRS_ROOT=$OTRS_HOME else -diff -ur otrs-3.0.11/bin/otrs.SetPermissions.pl otrs-3.0.11.new//bin/otrs.SetPermissions.pl otrs-3.0.11/bin/otrs.SetPermissions.pl 2011-10-11 14:01:45.0 +0200 -+++ otrs-3.0.11.new//bin/otrs.SetPermissions.pl2011-11-04 09:11:31.296872990 +0100 -@@ -76,7 +76,7 @@ +Tylko w otrs-3.2.1.new/bin: Cron.sh~ +diff -ur otrs-3.2.1/bin/otrs.SetPermissions.pl otrs-3.2.1.new/bin/otrs.SetPermissions.pl +--- otrs-3.2.1/bin/otrs.SetPermissions.pl 2013-01-24 11:21:14.0 +0100 otrs-3.2.1.new/bin/otrs.SetPermissions.pl 2013-01-29 12:39:39.175799680 +0100 +@@ -82,7 +82,7 @@ [--not-root] OTRS_HOME @@ -22,10 +23,11 @@ diff -ur otrs-3.0.11/bin/otrs.SetPermissions.pl otrs-3.0.11.new//bin/otrs.SetPer EOF if ( $#ARGV 0 ) { -diff -ur otrs-3.0.11/Kernel/Config/Defaults.pm otrs-3.0.11.new//Kernel/Config/Defaults.pm otrs-3.0.11/Kernel/Config/Defaults.pm 2011-10-11 14:01:54.0 +0200 -+++ otrs-3.0.11.new//Kernel/Config/Defaults.pm 2011-11-04 09:11:31.296872990 +0100 -@@ -302,7 +302,7 @@ +Tylko w otrs-3.2.1.new/bin: otrs.SetPermissions.pl~ +diff -ur otrs-3.2.1/Kernel/Config/Defaults.pm otrs-3.2.1.new/Kernel/Config/Defaults.pm +--- otrs-3.2.1/Kernel/Config/Defaults.pm 2013-01-17 10:06:52.0 +0100 otrs-3.2.1.new/Kernel/Config/Defaults.pm 2013-01-29 12:40:37.118464479 +0100 +@@ -297,7 +297,7 @@ #$Self-{'LogModule::SysLog::Charset'} = 'utf-8'; # param for LogModule Kernel::System::Log::File (required!) @@ -34,7 +36,7 @@ diff -ur otrs-3.0.11/Kernel/Config/Defaults.pm otrs-3.0.11.new//Kernel/Config/De # param if the date (-mm) should be added as suffix to # logfile [0|1] -@@ -834,7 +834,7 @@ +@@ -824,7 +824,7 @@ # directories # # --- # # root directory @@ -43,7 +45,7 @@ diff -ur otrs-3.0.11/Kernel/Config/Defaults.pm otrs-3.0.11.new//Kernel/Config/De # tmp dir $Self-{TempDir} = 'OTRS_CONFIG_Home/var/tmp'; -@@ -987,7 +987,7 @@ +@@ -965,7 +965,7 @@ # --- # $Self-{PGP} = 0; $Self-{'PGP::Bin'} = '/usr/bin/gpg'; @@ -52,33 +54,33 @@ diff -ur otrs-3.0.11/Kernel/Config/Defaults.pm otrs-3.0.11.new//Kernel/Config/De #$Self-{'PGP::Options'} = '--batch --no-tty --yes'; #$Self-{'PGP::Key::Password'}-{'D2DF79FA'} = 1234; -Tylko w otrs-3.0.11.new//Kernel/Config: Defaults.pm.orig -diff -ur otrs-3.0.11/Kernel/Config/Files/Framework.xml otrs-3.0.11.new//Kernel/Config/Files/Framework.xml otrs-3.0.11/Kernel/Config/Files/Framework.xml 2011-10-11 14:01:54.0 +0200 -+++ otrs-3.0.11.new//Kernel/Config/Files/Framework.xml 2011-11-04 09:11:31.300206326 +0100 -@@ -499,7 +499,7 @@ +Tylko w otrs-3.2.1.new/Kernel/Config: Defaults.pm~ +diff -ur otrs-3.2.1/Kernel/Config/Files/Framework.xml otrs-3.2.1.new/Kernel/Config/Files/Framework.xml +--- otrs-3.2.1/Kernel/Config/Files/Framework.xml 2013-01-03 10:12:36.0 +0100 otrs-3.2.1.new/Kernel/Config/Files/Framework.xml 2013-01-29 12:41:09.689962451 +0100 +@@ -493,7 +493,7 @@ GroupFramework/Group SubGroupCore::Log/SubGroup Setting -String Regex=/tmp/otrs.log/String -+String Regex=/var/log/otrs.log/String ++ String Regex=/usr/share/otrs.log/String /Setting /ConfigItem ConfigItem Name=LogModule::LogFile::Date Required=1 Valid=1 -@@ -2787,7 +2787,7 @@ +@@ -2834,7 +2834,7 @@ GroupFramework/Group SubGroupCrypt::PGP/SubGroup Setting -String Regex=--homedir /opt/otrs/.gnupg/ --batch --no-tty --yes/String -+String Regex=--homedir /usr/share/otrs/.gnupg/ --batch --no-tty --yes/String ++ String Regex=--homedir /usr/share/otrs/.gnupg/ --batch --no-tty
[packages/otrs] - updated to 3.2.1; TODO still exist
commit 87cd8ae1df62133092d518b652fabb539f920a29 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Jan 29 13:03:42 2013 +0100 - updated to 3.2.1; TODO still exist otrs.spec | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) --- diff --git a/otrs.spec b/otrs.spec index a8e142f..f713957 100644 --- a/otrs.spec +++ b/otrs.spec @@ -15,13 +15,13 @@ Summary: The Open Ticket Request System Summary(pl.UTF-8): Open Ticket Request System - otwarty system zgłaszania żądań Name: otrs -Version: 3.1.11 +Version: 3.2.1 Release: 1 Epoch: 1 License: GPL Group: Applications/Databases Source0: http://ftp.otrs.org/pub/otrs/%{name}-%{version}.tar.bz2 -# Source0-md5: 361e2d28b720f872622a87c9f41664e9 +# Source0-md5: 9f096d37d6c4842680962676ef32a2f7 Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch @@ -279,6 +279,7 @@ fi %dir %{otrsdir}/Kernel/Output/HTML %dir %{otrsdir}/Kernel/Output/HTML/Standard %attr(644,otrs,http) %config(noreplace) %{otrsdir}/Kernel/Output/HTML/Standard/*.dtl +%attr(644,otrs,http) %config(noreplace) %{otrsdir}/Kernel/Output/HTML/Standard/ProcessManagement/*.dtl %dir %{otrsdir}/Kernel/Scheduler %{otrsdir}/Kernel/Scheduler/*.pm %dir %{otrsdir}/Kernel/Scheduler/TaskHandler @@ -305,6 +306,12 @@ fi %dir %{otrsdir}/Kernel/System/PostMaster %dir %{otrsdir}/Kernel/System/PostMaster/LoopProtection %dir %{otrsdir}/Kernel/System/PostMaster/Filter +%dir %{otrsdir}/Kernel/System/ProcessManagement +%dir %{otrsdir}/Kernel/System/ProcessManagement/DB +%dir %{otrsdir}/Kernel/System/ProcessManagement/DB/Process +%{otrsdir}/Kernel/System/ProcessManagement/DB/Process/State.pm +%dir %{otrsdir}/Kernel/System/ProcessManagement/TransitionAction +%dir %{otrsdir}/Kernel/System/ProcessManagement/TransitionValidation %dir %{otrsdir}/Kernel/System/Queue %dir %{otrsdir}/Kernel/System/Scheduler %dir %{otrsdir}/Kernel/System/SLA gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/87cd8ae1df62133092d518b652fabb539f920a29 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: otrs: otrs-3.2.1.tar.bz2
Files fetched: 1 STORED: http://ftp.otrs.org/pub/otrs/otrs-3.2.1.tar.bz2 9f096d37d6c4842680962676ef32a2f7 otrs-3.2.1.tar.bz2 Size: 18065388 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - added dir Kernel/Output/HTML/Standard/ProcessManagement
commit 8ade7ee9fc5961f07dc2c79df5395873f2485c79 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Jan 29 13:14:11 2013 +0100 - added dir Kernel/Output/HTML/Standard/ProcessManagement otrs.spec | 1 + 1 file changed, 1 insertion(+) --- diff --git a/otrs.spec b/otrs.spec index f713957..3453459 100644 --- a/otrs.spec +++ b/otrs.spec @@ -279,6 +279,7 @@ fi %dir %{otrsdir}/Kernel/Output/HTML %dir %{otrsdir}/Kernel/Output/HTML/Standard %attr(644,otrs,http) %config(noreplace) %{otrsdir}/Kernel/Output/HTML/Standard/*.dtl +%dir %{otrsdir}/Kernel/Output/HTML/Standard/ProcessManagement %attr(644,otrs,http) %config(noreplace) %{otrsdir}/Kernel/Output/HTML/Standard/ProcessManagement/*.dtl %dir %{otrsdir}/Kernel/Scheduler %{otrsdir}/Kernel/Scheduler/*.pm gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/8ade7ee9fc5961f07dc2c79df5395873f2485c79 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/otrs] - added missing R and S
commit d75a1c6b4984cb8207e93063b4d225b7f283f1b5 Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Tue Jan 29 13:21:35 2013 +0100 - added missing R and S otrs.spec | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --- diff --git a/otrs.spec b/otrs.spec index 3453459..8e7c755 100644 --- a/otrs.spec +++ b/otrs.spec @@ -26,8 +26,8 @@ Source1: %{name}-logrotate Source2: %{name}.sysconfig Patch0:%{name}-paths.patch URL: http://otrs.org/ -BuildRequires: rpm-perlprov BuildRequires: FIX_TODO_DO_NOT_SEND_TO_TH +BuildRequires: rpm-perlprov BuildRequires: rpmbuild(macros) = 1.268 Requires(pre): /bin/id Requires(pre): /usr/sbin/useradd @@ -37,10 +37,13 @@ Requires: perl-Crypt-PasswdMD5 Requires: perl-DBD-mysql Requires: perl-DBI Requires: perl-Text-CSV +Requires: perl-YAML-LibYAML Requires: procmail Requires: smtpdaemon Requires: webapps Requires: webserver = apache +Suggests: perl-Crypt-SSLeay +Suggests: perl-JSON-XS Suggests: perl-PDF-API2 Conflicts: logrotate 3.7-4 BuildArch: noarch gitweb: http://git.pld-linux.org/gitweb.cgi/packages/otrs.git/commitdiff/d75a1c6b4984cb8207e93063b4d225b7f283f1b5 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pldcpan] - removed obsolete CVS parts
commit bf1caf2b2cd9729fd6ddd5f1351e7dba1075579b Author: Sławomir Paszkiewicz paszc...@pld-linux.org Date: Fri Oct 19 09:34:22 2012 +0200 - removed obsolete CVS parts pldcpan.pl | 8 1 file changed, 8 deletions(-) --- diff --git a/pldcpan.pl b/pldcpan.pl index d9b764e..4eb4d2e 100644 --- a/pldcpan.pl +++ b/pldcpan.pl @@ -789,7 +789,6 @@ for my $arg (@ARGV) { # vim: ts=4 sw=4 noet noai nosi cin __DATA__ -# $[% 'Revision:$, $Date'%]:$ # # Conditional build: %bcond_without tests # do not perform make test @@ -932,10 +931,3 @@ rm -rf $RPM_BUILD_ROOT [% IF test_has_examples -%] %{_examplesdir}/%{name}-%{version} [% END -%] - -%definedate%(echo `LC_ALL=C date +%a %b %d %Y`) -%changelog -* %{date} PLD Team feedb...@pld-linux.org -All persons listed below can be reached at cvs_login@pld-linux.org - -$[%'Log:'%]$ gitweb: http://git.pld-linux.org/gitweb.cgi/packages/pldcpan.git/commitdiff/bf1caf2b2cd9729fd6ddd5f1351e7dba1075579b ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit