January 2013 - openSUSE Commits - openSUSE Mailing Lists

commit bsd-games for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package bsd-games for openSUSE:Factory checked in at 2013-01-31 16:25:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bsd-games (Old) and /work/SRC/openSUSE:Factory/.bsd-games.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bsd-games", Maintainer is "nadvornik(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bsd-games/bsd-games.changes 2013-01-20 14:29:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bsd-games.new/bsd-games.changes 2013-01-31 16:25:30.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Jan 29 23:35:52 UTC 2013 - joop.boonen(a)opensuse.org + +- Fixed SLES build + +------------------------------------------------------------------- +Sun Jan 27 13:48:42 UTC 2013 - joop.boonen(a)opensuse.org + +- The binaries are now in /usr/bin like other games owned by root +- A more secure attr setup that afik cant be exploited any more +- Got rid of dm as it can cause a security issue, it not really + needed to play the games + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bsd-games.spec ++++++ --- /var/tmp/diff_new_pack.KhJaB2/_old 2013-01-31 16:25:32.000000000 +0100 +++ /var/tmp/diff_new_pack.KhJaB2/_new 2013-01-31 16:25:32.000000000 +0100 @@ -16,7 +16,6 @@ # - Name: bsd-games Version: 2.17 Release: 0 @@ -50,8 +49,6 @@ BuildRequires: libopenssl-devel BuildRequires: ncurses-devel BuildRequires: words -Provides: bsdgames -Obsoletes: bsdgames BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -85,33 +82,49 @@ %install make INSTALL_PREFIX=%{buildroot} install -chmod -R g+w %{buildroot}%{_localstatedir}/games/* -# create a list of binaries to be checked externally -: > %{buildroot}%{_datadir}/games/sgidlist -: > filelist.add -for i in `ls %{buildroot}%{_prefix}/games` ; do - echo $i - case $i in - atc|battlestar|cfscores|cribbage|phantasia|robots|sail|snake|tetris-bsd|\ - adventure|arithmetic|backgammon|boggle|caesar|canfield|dm|fish|gomoku|hangman|\ - hunt|huntd|mille|monop|pig|pom|ppt|primes|quiz|rain|snscore|teachgammon|\ - trek|worm|worms|wump|dab) - echo "/usr/games/$i" >> %{buildroot}%{_datadir}/games/sgidlist - echo "%%verify(not mode) %%attr(0755,games,games) /usr/games/$i" >> filelist.add - ;; - *) - echo "%%attr(0755,games,games) /usr/games/$i" >> filelist.add - ;; - esac -done +# get rid of dm functionality as it needs a setgid, dm is only used to restrict which games may be played +rm %{buildroot}%{_prefix}/games/dm +rm -rf %{buildroot}%{_mandir}/man5 +rm -rf %{buildroot}%{_mandir}/man8 +# move the programs into /usr/bin as this is the proper location +mkdir %{buildroot}%{_bindir} +mv %{buildroot}%{_prefix}/games/* %{buildroot}%{_bindir}/ +rmdir %{buildroot}%{_prefix}/games +find %{buildroot}%{_localstatedir}/games/ -exec chmod g-w,o-rw {} \; rm %{buildroot}%{_datadir}/doc/bsd-games/trek.me -%files -f filelist.add -%defattr(-,root,root) +%files +%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING NEWS README SECURITY THANKS TODO YEAR2000 -%doc %{_mandir}/*/* -%attr(-,games,games) %{_datadir}/games/* -%attr(-,games,games) %{_localstatedir}/games/* -%attr(-,games,games) %{_datadir}/misc/* +%{_bindir}/* +%{_mandir}/man6/* +%{_datadir}/misc/* +%{_datadir}/games/* +%attr(770,games,games) %{_localstatedir}/games/hack +%attr(770,games,games) %{_localstatedir}/games/phantasia +%attr(770,games,games) %{_localstatedir}/games/sail +%attr(660,games,games) %{_localstatedir}/games/hack/data +%attr(660,games,games) %{_localstatedir}/games/hack/help +%attr(660,games,games) %{_localstatedir}/games/hack/hh +%attr(660,games,games) %{_localstatedir}/games/hack/perm +%attr(660,games,games) %{_localstatedir}/games/hack/record +%attr(660,games,games) %{_localstatedir}/games/hack/rumors +%attr(660,games,games) %{_localstatedir}/games/phantasia/characs +%attr(660,games,games) %{_localstatedir}/games/phantasia/gold +%attr(660,games,games) %{_localstatedir}/games/phantasia/lastdead +%attr(660,games,games) %{_localstatedir}/games/phantasia/mess +%attr(660,games,games) %{_localstatedir}/games/phantasia/monsters +%attr(660,games,games) %{_localstatedir}/games/phantasia/motd +%attr(660,games,games) %{_localstatedir}/games/phantasia/scoreboard +%attr(660,games,games) %{_localstatedir}/games/phantasia/void +%attr(660,games,games) %{_localstatedir}/games/atc_score +%attr(660,games,games) %{_localstatedir}/games/battlestar.log +%attr(660,games,games) %{_localstatedir}/games/cfscores +%attr(660,games,games) %{_localstatedir}/games/criblog +%attr(660,games,games) %{_localstatedir}/games/robots_roll +%attr(660,games,games) %{_localstatedir}/games/saillog +%attr(660,games,games) %{_localstatedir}/games/snake.log +%attr(660,games,games) %{_localstatedir}/games/snakerawscores +%attr(660,games,games) %{_localstatedir}/games/tetris-bsd.scores %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit apache2-mod_wsgi for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package apache2-mod_wsgi for openSUSE:Factory checked in at 2013-01-31 16:25:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_wsgi (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2-mod_wsgi", Maintainer is "kkaempf(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_wsgi/apache2-mod_wsgi.changes 2012-12-07 14:06:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.apache2-mod_wsgi.new/apache2-mod_wsgi.changes 2013-01-31 16:25:03.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Jan 30 14:39:38 UTC 2013 - dimstar(a)opensuse.org + +- Update to version 3.4: + + New support for Apache 2.4 + + Support for Python 3.2 + + Is now guaranteed that mod_ssl access handler is run before + that for mod_wsgi so that any per request variables setup by + mod_ssl are available in the mod_wsgi access handler as + implemented by WSGIAccessScript directive. + + Added 'python-home' option to WSGIDaemonProcess. + + Added 'lang' and 'locale' options to WSGIDaemonProcess. + + Split combined WWW-Authenticate header returned from daemon + process back into separate headers. +- Introduce build compatibility with apache 2.4: apxs2 was moved + from %{_sbindir} to %{_bindir} + +------------------------------------------------------------------- Old: ---- mod_wsgi-3.3.tar.gz New: ---- mod_wsgi-3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_wsgi.spec ++++++ --- /var/tmp/diff_new_pack.0B5VD1/_old 2013-01-31 16:25:05.000000000 +0100 +++ /var/tmp/diff_new_pack.0B5VD1/_new 2013-01-31 16:25:05.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_wsgi # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: apache2-mod_wsgi -Version: 3.3 +Version: 3.4 Release: 0 Summary: Python WSGI adapter module for Apache License: Apache-2.0 @@ -25,7 +25,12 @@ Url: http://code.google.com/p/modwsgi/ Source: http://modwsgi.googlecode.com/files/mod_wsgi-%{version}.tar.gz %define tarname mod_wsgi -%define apxs /usr/sbin/apxs2 +%define apache_branch %(rpm -q --qf %%{version} apache2 | grep -E -o "2\\.[0-9]+") +%if "%{apache_branch}" == "2.4" + %define apxs %{_bindir}/apxs2 +%else + %define apxs %{_sbindir}/apxs2 +%endif %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) BuildRequires: apache2-devel BuildRequires: python-devel ++++++ mod_wsgi-3.3.tar.gz -> mod_wsgi-3.4.tar.gz ++++++ ++++ 2015 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fontconfig for openSUSE:12.1:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package fontconfig for openSUSE:12.1:Update checked in at 2013-01-31 16:16:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/fontconfig (Old) and /work/SRC/openSUSE:12.1:Update/.fontconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontconfig", Maintainer is "PGajdos(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='fontconfig.1257' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fontconfig.1257 for openSUSE:12.1:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package fontconfig.1257 for openSUSE:12.1:Update checked in at 2013-01-31 16:16:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/fontconfig.1257 (Old) and /work/SRC/openSUSE:12.1:Update/.fontconfig.1257.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fontconfig.1257", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:12.1:Update/.fontconfig.1257.new/fontconfig.changes 2013-01-31 16:16:52.000000000 +0100 @@ -0,0 +1,1482 @@ +------------------------------------------------------------------- +Fri Jan 25 13:16:45 UTC 2013 - pgajdos(a)suse.com + +- removing bnc438855-make-FcInitReinitialize-work-again.patch + [bnc#227385] + +------------------------------------------------------------------- +Tue Oct 25 10:28:47 UTC 2011 - pgajdos(a)suse.com + +- add /etc/fonts/local.conf [bnc#722427] + +------------------------------------------------------------------- +Wed Oct 5 14:35:54 UTC 2011 - uli(a)suse.com + +- cross-build fix: force host architecture + +------------------------------------------------------------------- +Sun Sep 18 17:17:12 UTC 2011 - jengelh(a)medozas.de + +- Apply packaging guidelines (remove redundant/obsolete + tags/sections from specfile, etc.) + +------------------------------------------------------------------- +Fri Jan 21 10:36:23 UTC 2011 - coolo(a)novell.com + +- regenerate doc tar ball + +------------------------------------------------------------------- +Tue Dec 7 11:41:33 CET 2010 - pgajdos(a)suse.cz + +- <prefer> DejaVu Mono before Andale Mono [bnc#656184] + +------------------------------------------------------------------- +Thu Nov 25 13:15:08 CET 2010 - pgajdos(a)suse.cz + +- <prefer> "Liberation Mono" instead of "Liberation Sans" in + monospace <family> + +------------------------------------------------------------------- +Tue Nov 9 11:52:25 CET 2010 - pgajdos(a)suse.cz + +- prefer Nanum fonts before Un fonts [bnc#647355] + * modified suse-post-user.conf +- turn autohinting for unfonts on [bnc#647355] + * modified suse-hinting.conf + +------------------------------------------------------------------- +Tue Aug 31 14:29:08 CEST 2010 - pgajdos(a)suse.cz + +- add AvantGarde, NewCenturySchoolbook, ZapfChancery and + ZapfDingbats aliases into 30-urw-aliases.conf as + workaround to [bnc#434676] + --> added urw-aliases-whitespaces.patch +- see http://bugs.freedesktop.org/show_bug.cgi?id=19128 + +------------------------------------------------------------------- +Fri Jul 23 08:39:25 UTC 2010 - mxwu(a)novell.com + +- add 10-lcdfilter-lcddefault.conf. + * enable lcdfilter. + +------------------------------------------------------------------- +Fri Jun 4 11:51:55 UTC 2010 - coolo(a)novell.com + +- revert the previous change after I reenabled the freetype2 patch + +------------------------------------------------------------------- +Tue Apr 6 14:33:12 UTC 2010 - coolo(a)novell.com + +- disable patch that 'fixes' make check for a patched freetype2 + +------------------------------------------------------------------- +Thu Feb 11 09:38:44 UTC 2010 - mxwu(a)novell.com + +- Add support for WenQuanYi Bitmap Song. + +------------------------------------------------------------------- +Mon Dec 14 20:22:32 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Mon Dec 7 11:14:35 CET 2009 - pgajdos(a)suse.cz + +- updated to version 2.8.0 (see README) + +------------------------------------------------------------------- +Tue Nov 3 19:09:16 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Mon Aug 31 16:14:45 CEST 2009 - tiwai(a)suse.de + +- add wqy-zenhei fonts to suse-post-user.conf (bnc#519059) + +------------------------------------------------------------------- +Thu Jul 9 12:07:15 CEST 2009 - tiwai(a)suse.de + +- updated to version 2.7.0: + * update Thai default families + * add ~/.fonts.conf.d to default config + * fc-list --verbose and --quiet options + * added fc-scan and fc-query + * see details below + http://fontconfig.org/release/ChangeLog-2.7.0 + +------------------------------------------------------------------- +Mon Feb 23 19:12:01 CET 2009 - crrodriguez(a)suse.de + +- fontconfig leaks memory [bnc#302498] + +------------------------------------------------------------------- +Thu Feb 05 13:02:59 CET 2009 - mfabian(a)suse.de + +- cleanup old patches: + • remove obsolete fc-app-dir-fix-new-new.diff + • remove obsolete fontconfig-minmaxabs.patch + • remove obsolete fc-cache.patch. + • remove obsolete bugzilla-160226-multiarch-cache-file-problem.patch + • remove fc-match.patch which reversed the order of + FcDefaultSubstitute() and FcConfigSubstitute(), this was only + experimental and always commented out in the fontconfig.spec file. + • remove obsolete + bugzilla-128937-turn-off-embedded-bitmaps-by-default.patch + • remove obsolete fc-verbose.diff. + +------------------------------------------------------------------- +Tue Feb 03 16:43:16 CET 2009 - mfabian(a)suse.de + +- bnc#468407: add the Arabic font "KacstBook" to the preference + lists for serif, sans-serif, and monospace. Until now there was + no font at all preferred for Arabic when the dejavu fonts were + not installed and even if they were installed there was still no + preferred Arabic font for serif. This caused a certain + randomness in the fonts used by YaST2. + +------------------------------------------------------------------- +Mon Jan 26 17:59:34 CET 2009 - mfabian(a)suse.de + +- bnc#466068: insert "VL Gothic" in the preference lists between + "IPA Gothic" and "Sazanami Gothic". + +------------------------------------------------------------------- +Wed Dec 10 12:34:56 CET 2008 - olh(a)suse.de + +- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade + (bnc#437293) + +------------------------------------------------------------------- +Mon Nov 24 12:34:56 CET 2008 - olh(a)suse.de + +- obsolete old -XXbit packages (bnc#437293, bnc#439840) + +------------------------------------------------------------------- +Fri Nov 07 18:22:17 CET 2008 - mfabian(a)suse.de + +- bnc#438855: make FcInitReinitialize() work again. This function + is important to make it possible for YaST2 to load new fonts + which are copied into instsys after YaST2 is already running. + +------------------------------------------------------------------- +Wed Oct 29 18:56:15 CET 2008 - mfabian(a)suse.de + +- bnc#433591: make "Lohit Oriya" the default font for Oriya. See + also: + https://bugzilla.mozilla.org/show_bug.cgi?id=461155 +- change /usr/share/doc/fontconfig to /usr/share/doc/packages/fontconfig + in the documentation (man-pages and sgml). + +------------------------------------------------------------------- +Tue Sep 23 13:27:10 CEST 2008 - mfabian(a)suse.de + +- kill "la" files and static libraries *only* for versions > + openSUSE 11.0. + +------------------------------------------------------------------- +Wed Sep 10 16:55:07 CEST 2008 - mfabian(a)suse.de + +- update to 2.6.0. Some changes from the ChangeLog: + • new configurables for sub-pixel filter configuration. + • Don't check cache file time stamps when cleaning cache dir. + Cache file mtime is meaningless now that the directory time is + encoded in + the cache. + • Also check configDirs mtimes in FcConfigUptoDate + Checking only config files and font directories can miss + changes which affect only a configuration directory. Check + those to catch any changes. + • Update CaseFolding.txt to Unicode 5.1.0 +- remove fix-pattern-duplicate.diff (included upstream). + +------------------------------------------------------------------- +Tue Aug 26 12:14:12 CEST 2008 - crrodriguez(a)suse.de + +- kill "la" files and static libraries + ++++ 1285 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update/.fontconfig.1257.new/fontconfig.changes New: ---- 10-lcdfilter-lcddefault.conf 29-liberation-aliases.conf AppleRoman-DynaFont.patch baselibs.conf bugzilla-179457-fix-font-file-names-for-wine.patch bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch conf.patch fontconfig-2.8.0.tar.bz2 fontconfig-doc-2.8.0.tar.bz2 fontconfig.changes fontconfig.spec iso639-1 iso639-2 local.conf local.conf.instsys make-check.patch suse-bitmaps.conf suse-font-dirs.conf suse-generic-names.conf suse-hinting.conf suse-post-user.conf suse-pre-user.conf urw-aliases-whitespaces.patch usr-share-doc-packages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fontconfig.spec ++++++ # # spec file for package fontconfig # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: fontconfig %define build_docs 0 BuildRequires: freetype2-devel libexpat-devel pkgconfig %if %{build_docs} BuildRequires: docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel %endif License: Public Domain, Freeware ; MIT License (or similar) Provides: XFree86:/etc/fonts/fonts.dtd Group: System/Libraries Url: http://fontconfig.org/ # bug437293 %ifarch ppc64 Obsoletes: fontconfig-64bit %endif Requires: bash Version: 2.8.0 Release: 14 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login # CVS password: <hit return> # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig co fontconfig # Source0: http://fontconfig.org/release/%name-%version.tar.bz2 # oldneededforbuild expat freetype2 freetype2-devel pkgconfig # # After building with "build_docs" defined to "1" generate the doc tarball with: # tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt Source1: %name-doc-%version.tar.bz2 Source2: iso639-1 Source3: iso639-2 Source4: baselibs.conf Source10: suse-generic-names.conf Source11: suse-pre-user.conf Source12: suse-post-user.conf Source13: suse-hinting.conf Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source16: local.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf Source31: 10-lcdfilter-lcddefault.conf # http://www.kde.gr.jp/~akito/patch/ # http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.… Patch5: AppleRoman-DynaFont.patch Patch10: conf.patch Patch16: make-check.patch Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch Patch34: urw-aliases-whitespaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Fontconfig is a library for configuring and customizing font access. It contains two essential modules: the configuration module, which builds an internal configuration from XML files, and the matching module, which accepts font patterns and returns the nearest matching font. %package devel License: MIT License (or similar) Requires: %{name} = %version Requires: freetype2-devel glibc-devel Provides: XFree86-devel:%_libdir/pkgconfig/fontconfig.pc Group: Development/Libraries/C and C++ Summary: Include Files and Libraries mandatory for Development # bug437293 %ifarch ppc64 Obsoletes: fontconfig-devel-64bit %endif %description devel This package countains all include files, libraries, configuration files needed for compiling applications which use the fontconfig library. In addition, it contains extensive documentation and manual pages for developers using the library. Fontconfig is a library for configuring and customizing font access. It contains two essential modules, the configuration module which builds an internal configuration from XML files and the matching module which accepts font patterns and returns the nearest matching font. %prep %setup -q %if %{build_docs} < 1 tar -xvf %{SOURCE1} %endif %patch5 -p0 -b .dynafont %patch10 -p1 -b .fonts.conf %patch16 -p1 #%patch30 -p1 %patch31 -p1 %patch32 -p1 %patch34 -p1 %build %configure --with-pic --with-arch=%_host_cpu \ %if %suse_version > 1100 --disable-static \ %endif --with-freetype-lib=%_libdir \ --with-x \ --enable-libxml2=no \ --with-confdir=/etc/fonts \ --with-docdir=%{_defaultdocdir}/%{name} \ --with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \ %if %{build_docs} < 1 --disable-docs %else # %endif make %{?_smp_mflags} %check export MALLOC_CHECK_=2 make %{?_smp_mflags} check unset MALLOC_CHECK_ %install make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \ $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} #install -m 644 fc-lang/iso639-{1,2} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel install -m 644 doc/fontconfig-devel.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel for i in 1 3 5 do mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man${i}/ for j in fc-*/*.${i} doc/*.${i} doc/*/*.${i} do test -f ${j} && install -m 644 ${j} $RPM_BUILD_ROOT/%{_mandir}/man${i}/ done gzip --best $RPM_BUILD_ROOT/%{_mandir}/man${i}/*.${i} done # install the conf.d README as well, I think it's helpful: install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/local.conf $RPM_BUILD_ROOT/etc/fonts install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf ln -s ../conf.avail/51-local.conf 55-local.conf ln -s ../conf.avail/50-user.conf 56-user.conf ln -s ../suse-post-user.conf 58-suse-post-user.conf popd # don't package any files in the cache directory, only the directory itself: rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/* %if %suse_version > 1100 rm -f %{buildroot}%{_libdir}/*.la %endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc %{_defaultdocdir}/%{name} %{_bindir}/* %dir /etc/fonts %config /etc/fonts/fonts.dtd %config /etc/fonts/fonts.conf %config /etc/fonts/suse-generic-names.conf %config /etc/fonts/suse-font-dirs.conf %config /etc/fonts/suse-pre-user.conf %config /etc/fonts/suse-post-user.conf %config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf %config %verify(not md5 size mtime) /etc/fonts/suse-bitmaps.conf %dir /etc/fonts/conf.avail/ /etc/fonts/conf.avail/* %dir /etc/fonts/conf.d/ /etc/fonts/conf.d/README %config(noreplace) /etc/fonts/conf.d/*.conf %config(noreplace) /etc/fonts/local.conf %config /etc/fonts/local.conf.instsys %{_libdir}/libfontconfig.so.* %{_mandir}/man5/fonts-conf.5.gz %{_mandir}/man1/* %dir /var/cache/fontconfig/ %files devel %defattr(-,root,root) %doc %{_defaultdocdir}/%{name}-devel %{_libdir}/pkgconfig/fontconfig.pc %{_libdir}/libfontconfig.so %if %suse_version <= 1100 %{_libdir}/libfontconfig.*a %endif %{_mandir}/man3/Fc* %{_includedir}/fontconfig/ %changelog ++++++ AppleRoman-DynaFont.patch ++++++ --- src/fcfreetype.c~ 2004-03-02 23:54:42.000000000 +0800 +++ src/fcfreetype.c 2004-04-01 18:06:44.154517544 +0800 @@ -1204,6 +1204,7 @@ { 0x007C, 0x7C }, /* VERTICAL LINE */ { 0x007D, 0x7D }, /* RIGHT CURLY BRACKET */ { 0x007E, 0x7E }, /* TILDE */ +#if 0 { 0x00A0, 0xCA }, /* NO-BREAK SPACE */ { 0x00A1, 0xC1 }, /* INVERTED EXCLAMATION MARK */ { 0x00A2, 0xA2 }, /* CENT SIGN */ @@ -1332,6 +1333,7 @@ { 0xF8FF, 0xF0 }, /* Apple logo */ { 0xFB01, 0xDE }, /* LATIN SMALL LIGATURE FI */ { 0xFB02, 0xDF }, /* LATIN SMALL LIGATURE FL */ +#endif }; static const FcCharMap AppleRoman = { ++++++ baselibs.conf ++++++ fontconfig +/usr/bin/fc-cache -> /usr/bin/fc-cache<extension> +/usr/bin/fc-cat -> /usr/bin/fc-cat<extension> +/usr/bin/fc-list -> /usr/bin/fc-list<extension> +/usr/bin/fc-match -> /usr/bin/fc-match<extension> fontconfig-devel ++++++ bugzilla-179457-fix-font-file-names-for-wine.patch ++++++ diff -ru fontconfig-2.3.94.orig/src/fcpat.c fontconfig-2.3.94/src/fcpat.c --- fontconfig-2.3.94.orig/src/fcpat.c 2006-03-10 16:00:36.000000000 +0100 +++ fontconfig-2.3.94/src/fcpat.c 2006-06-02 13:27:57.000000000 +0200 @@ -1098,6 +1112,39 @@ return FcPatternAdd (p, object, v, FcTrue); } +static FcResult +FcPatternGetFile (const FcPattern *p, const char *object, int id, FcChar8 ** s) +{ + const char *fn, *fpath; + FcChar8 *fname; + int size; + + fn = FcPatternFindFullFname(p); + if (fn) + { + *s = (FcChar8 *) fn; + return FcResultMatch; + } + + if (!p->bank) + return FcResultMatch; + + fpath = FcCacheFindBankDir (p->bank); + size = strlen((char *)fpath) + 1 + strlen ((char *)*s) + 1; + fname = malloc (size); + if (!fname) + return FcResultOutOfMemory; + + FcMemAlloc (FC_MEM_STRING, size); + strcpy ((char *)fname, (char *)fpath); + strcat ((char *)fname, "/"); + strcat ((char *)fname, (char *)*s); + + FcPatternAddFullFname (p, (const char *)fname); + *s = (FcChar8 *)fname; + return FcResultMatch; +} + FcResult FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v) { @@ -1112,6 +1159,12 @@ if (!id) { *v = FcValueCanonicalize(&FcValueListPtrU(l)->value); + + /* Pull the FC_FILE trick here too. */ + if (v->type == FcTypeString && + FcObjectToPtr(object) == FcObjectToPtr(FC_FILE)) + return FcPatternGetFile (p, object, id, (FcChar8 **)&(v->u.s)); + return FcResultMatch; } id--; @@ -1175,41 +1228,6 @@ if (v.type != FcTypeString) return FcResultTypeMismatch; - if (FcObjectToPtr(object) == FcObjectToPtr(FC_FILE)) - { - const char *fn, *fpath; - FcChar8 *fname; - int size; - - fn = FcPatternFindFullFname(p); - if (fn) - { - *s = (FcChar8 *) fn; - return FcResultMatch; - } - - if (!p->bank) - { - *s = (FcChar8 *) v.u.s; - return FcResultMatch; - } - - fpath = FcCacheFindBankDir (p->bank); - size = strlen((char*)fpath) + 1 + strlen ((char *)v.u.s) + 1; - fname = malloc (size); - if (!fname) - return FcResultOutOfMemory; - - FcMemAlloc (FC_MEM_STRING, size); - strcpy ((char *)fname, (char *)fpath); - strcat ((char *)fname, "/"); - strcat ((char *)fname, (char *)v.u.s); - - FcPatternAddFullFname (p, (const char *)fname); - *s = (FcChar8 *)fname; - return FcResultMatch; - } - *s = (FcChar8 *) v.u.s; return FcResultMatch; } ++++++ bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch ++++++ Index: fontconfig-2.7.0/src/fcxml.c =================================================================== --- fontconfig-2.7.0.orig/src/fcxml.c +++ fontconfig-2.7.0/src/fcxml.c @@ -539,6 +539,9 @@ FcTypecheckExpr (FcConfigParse *parse, F { const FcObjectType *o; const FcConstant *c; + + if (!expr) + return; /* If parsing the expression failed, some nodes may be NULL */ if (!expr) ++++++ conf.patch ++++++ diff -ru fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf fontconfig-2.6.0/conf.d/40-nonlatin.conf --- fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf 2008-05-25 00:45:51.000000000 +0200 +++ fontconfig-2.6.0/conf.d/40-nonlatin.conf 2008-09-10 17:20:32.000000000 +0200 @@ -24,6 +24,7 @@ <family>ＭＳ明朝</family> <family>UnBatang</family> <family>Baekmuk Batang</family> + <family>SimSun</family> <family>MgOpen Canonica</family> <family>Sazanami Mincho</family> <family>AR PL ZenKai Uni</family> @@ -49,7 +50,6 @@ <family>ＭＳゴシック</family> <family>UnDotum</family> <family>Baekmuk Dotum</family> - <family>SimSun</family> <family>MgOpen Modata</family> <family>Sazanami Gothic</family> <family>AR PL ShanHeiSun Uni</family> ++++++ iso639-1 ++++++ AA * Afar Djibouti, N Ethiopia Hamito-Semitic F., Cushitic Br. AB * Abkhazian Abkhazia (Georgia) Caucasian F. AF * Afrikaans South Africa, Namibia Indo-European F., Germanic Br. 10 AM * Amharic Ethiopia Hamito-Semitic F., Semitic Br. 20 AR * Arabic Middle East, N Africa Hamito-Semitic F., Semitic Br. 218 AS Assamese Assam (India) Indo-European F., Indo-Iranian Br. 23 AY * Aymara Bolivia, Peru Andean-Equatorial F., Andean Br. 2 AZ * Azerbaijani Iran, Azerbaijan Uralo-Altaic F., Turkic Br. 15 BA * Bashkir Bashkir (S Urals, Russia) Uralo-Altaic F., Turkic Br. 1 BE * Byelorussian Byelorussia Indo-European F., Balto-Slavic Br. 10 BG * Bulgarian Bulgaria, Yugoslavia, Greece Indo-European F., Balto-Slavic Br. 9 BH * Bihari Bihar (India) Indo-European F., Indo-Iranian Br. BI * Bislama Vanuatu, New Caledonia English based creole, Pacific BN * Bengali, Bangla Bangladesh, West Bengal (India) Indo-European F., Indo-Iranian Br. 196 BO * Tibetan Tibet, Bhutan, Nepal, India Sino-Tibetan F., Tibeto-Burmese Br. 5 BO from Bodskad BR * Breton Britanny (W France) Indo-European F., Celtic Br. CA * Catalan Catalania (NE Spain), Balearic Islands, Sardinia, S France, Andorra, Argentina Indo-European F., Italic Br. 9 CO * Corsican Corsica (France) Indo-European F., Italic Br. CS * Czech Czech Republic Indo-European F., Balto-Slavic Br. 11 CY * Welsh Wales (United Kingdom) Indo-European F., Celtic Br. DA * Danish Denmark, Germany Indo-European F., Germanic Br. 5 DE * German Germany, Austria, Switzerland, U.S.A. Indo-European F., Germanic Br. 121 DE from Deutsch DZ * Bhutani, Bhutanese Bhutan Sino-Tibetan F., Tibeto-Burmese Br. EL * Greek Greece, Cyprus, Turkey Indo-European F., Hellenic Br. 12 EN * English North America, British Isles, Australia, New Zealand, South Africa Indo-European F., Germanic Br. 470 EO * Esperanto 2 Artificial language ES * Spanish Spain, Latin America, U.S.A. Indo-European F., Italic Br. 381 ET * Estonian Estonia Uralo-Altaic F., Finno-Ugric Br. 1 EU * Basque W Pyrenees (France, Spain) (Isolate) EU from Euskera FA * Persian Iran, Afghanistan Indo-European F., Indo-Iranian Br. 35 FA from Farsi FI * Finnish, Suomi Finland, Russia, Sweden Uralo-Altaic F., Finno-Ugric Br. 6 FJ * Fiji, Fijian Fiji Austric F., Malayo-Polynesian Br. FO * Faroese, Faeroese Faeroe Islands (Denmark) Indo-European F., Germanic Br. FR * French France, Belgium, Canada, U.S.A., Switzerland Indo-European F., Italic Br. 124 FY * Frisian Frisian Islands (Netherlands-Germany) Indo-European F., Germanic Br. GA * Irish Ireland Indo-European F., Celtic Br. GA from Gaeilge GD * Scots Gaelic Scotland Indo-European F., Celtic Br. GL * Galician Spanish Galicia Indo-European F., Italic Br. 4 GN * Guaran? Paraguay, Bolivia, S Brazil Andean-Equatorial F., Equatorial Br. 4 GU * Gujarati, Gujerati Gujarat (India), Bombay, Pakistan, South Africa Indo-European F., Indo-Iranian Br. 40 HA * Hausa N Nigeria, Niger, Cameroun Hamito-Semitic F., Chadic Br. 37 HE * Hebrew Israel Hamito-Semitic F., Semitic Br. 5 Formerly IW from Iwrith. See Note 4. HI * Hindi India, Pakistan, Trinidad, Guyana, Fiji, Mauritius Indo-European F., Indo-Iranian Br. 418 Same as Urdu [UR] except for writing system. See Note 3. HR * Croatian, Croat Croatia Indo-European F., Balto-Slavic Br. HR from Hrvatski. See Note 2. HU * Hungarian, Magyar Hungary, Romania, Yugoslavia, Czechoslovakia Uralo-Altaic F., Finno-Ugric Br. 14 HY * Armenian Armenia, Middle East Indo-European F., Armenian Br. 5 HY from Hayeren IA * Interlingua Artificial language ID * Indonesian, Bahasa Indonesia Indonesia, Malaysia, Thailand, Singapore, Brunei Austric F., Malayo-Polynesian Br. Formerly IN. See Note 4. IE * Interlingue Artificial language. Prototype of Interlingua [IA] IK * Inupiak Greenland, N Canada, Alaska (U.S.A.) Eskimo-Aleut F. IS * Icelandic Iceland Indo-European F., Germanic Br. IS from Islenzk IT * Italian Italy, U.S.A., France, Argentina, Switzerland, Canada, Brazil Indo-European F., Italic Br. 62 IU * Inuktitut NE Canada Eskimo-Aleut F. See Note 5. JA * Japanese, Nihongo Japan, Brazil, California (U.S.A.), Hawaii (U.S.A.) Japanese-Korean F. 126 JW Javanese Java, Malaysia, Surinam Austric F., Malayo-Polynesian Br. 64 JW from Bahasa Jawa KA * Georgian Georgia Caucasian F. 3 KA from Kartuli KK * Kazakh Kazakhstan, Sinkiang (China), Afghanistan Uralo-Altaic F., Turkic Br. 8 KL * Greenlandic Greenland Eskimo-Aleut F. KL from Kalaallisut KM * Cambodian Cambodia, Thailand, Viet Nam Austric F., Austrio-Asiatic Br. 9 KM from Khmer KN * Kannada Karnatuka (India) Dravidian F. 44 KO * Korean, Choson-o South Korea, North Korea, NE China, Japan, Siberia, Hawaii (U.S.A.) Japanese-Korean F. 75 KS * Kashmiri Kashmir (India-Pakistan) Indo-European F., Indo-Iranian Br. 4 KU * Kurdish, Zimany Kurdy Turkey, Iran, Iraq, Syria Indo-European F., Indo-Iranian Br. 11 KY * Kirghiz Kirghiz, Sinkiang (China), Afghanistan Uralo-Altaic F., Turkic Br. 2 KY from Kyrgyz LA * Latin Indo-European F., Italic Br. Ancient language nearing extinction LN Lingala, liNgala Zaire, Congo Niger-Kordofanian F., Non-Mande Br. 7 LO * Laothian, Pha Xa Lao, Lao Laos, Thailand Sino-Tibetan F., Sino-Siamese Br. 4 LT * Lithuanian Lithuania Indo-European F., Balto-Slavic Br. 3 LV * Latvian, Lettish Latvia Indo-European F., Balto-Slavic Br. 2 MG * Malagasy Madagascar Austric F., Malayo-Polynesian Br. 12 MI * Maori New Zealand Austric F., Malayo-Polynesian Br. MK * Macedonian Macedonia, Bulgaria, Greece Indo-European F., Balto-Slavic Br. 2 ML * Malayalam Kerala (SW India) Dravidian F. 35 MN * Mongolian Mongolia Uralo-Altaic F., Mongolic Br. MO * Moldavian MR * Marathi, Mahrati Maharashtra (W India) Indo-European F., Indo-Iranian Br. 69 MS Malay Malaysia, Indonesia Austric F., Malayo-Polynesian Br. 155 MS from Bahasa Malaysia MT * Maltese Malta Hamito-Semitic F., Semitic Br. MY * Burmese Burma, Bangladesh Sino-Tibetan F., Tibeto-Burmese Br. 30 MY from Myanmasa NA Nauru, Nauruan Nauru Austric F., Malayo-Polynesian Br. NE * Nepali, Nepalese Nepal, Uttar Pradesh (India) Indo-European F., Indo-Iranian Br. 16 NL * Dutch Netherlands, Belgium Indo-European F., Germanic Br. 21 NL from Nederlands NO * Norwegian Norway Indo-European F., Germanic Br. 5 OC * Occitan S France Indo-European F., Italic Br. 4 OM * (Afan) Oromo, Galla Ethiopia, Kenya Hamito-Semitic F., Cushitic Br. 10 OR * Oriya Orissa (E India) Indo-European F., Indo-Iranian Br. 31 PA Punjabi Punjab (India), Pakistan Indo-European F., Indo-Iranian Br. 93 PA from Panjabi PL * Polish Poland, U.S.A. Indo-European F., Balto-Slavic Br. 44 PS Pashto, Pushto, Pushtu Afghanistan, Pakistan Indo-European F., Indo-Iranian Br. 21 PT * Portuguese Brazil, Portugal, Spain, Uruguay, Argentina, Azores, Goa, Madeira Indo-European F., Italic Br. 182 QU Quechua Peru, Ecuador, Bolivia Andean-Equatorial F., Andean Br. 8 RM * Rhaeto-Romance, Rhaeto-Romanic, Romansch S Switzerland, N Italy, Tyrol (Austria) Indo-European F., Italic Br. RN Kirundi, kiRundi Niger-Kordofanian F., Non-Mande Br. RO * Romanian, Rumanian Rumania Indo-European F., Italic Br. 25 RU * Russian Russia, former USSR republics Indo-European F., Balto-Slavic Br. 288 RW Kinyarwanda, kinyaRuanda Rwanda, Burundi, Uganda, Zaire, Tanzania Niger-Kordofanian F., Non-Mande Br. RW from Rwanda SA * Sanskrit India Indo-European F., Indo-Iranian Br. Ancient language SD Sindhi Pakistan, Sind (India) Indo-European F., Indo-Iranian Br. 18 SG Sangho, Sango-Ngbandi Central African Republic, Zaire Niger-Kordofanian F., Non-Mande Br. 4 SH * Serbo-Croatian Croatia Indo-European F., Balto-Slavic Br. 20 See Note 2. SI * Singhalese, Sinhalese Sri Lanka Indo-European F., Indo-Iranian Br. 13 SK * Slovak Slovakia Indo-European F., Balto-Slavic Br. 5 SL * Slovenian, Slovene Slovenia, Italy, Austria Indo-European F., Balto-Slavic Br. 2 SM * Samoan Samoa Austric F., Malayo-Polynesian Br. SN Shona, chiShona Rhodesia, Mozambique Niger-Kordofanian F., Non-Mande Br. 8 SO * Somali Somalia, Ethiopia, Kenya Hamito-Semitic F., Cushitic Br. 5 SQ * Albanian Albania, Kosovo (Yugoslavia), Italy, Greece Indo-European F., Albanian Br. 5 SQ from Shqip SR * Serbian Serbia Indo-European F., Balto-Slavic Br. SR from Srpski. See Note 2. SS Siswati, siSwati South Africa, Rhodesia, Swaziland Niger-Kordofanian F., Non-Mande Br. ST Sesotho, siSuthu South Africa, Lesotho, Botswana Niger-Kordofanian F., Non-Mande Br. SU Sundanese West Java Austric F., Malayo-Polynesian Br. 26 SV * Swedish Sweden, Finland Indo-European F., Germanic Br. 9 SV from Svenska SW * Swahili, kiSwahili Tanzania, Comoro Islands, Kenya, Mozambique, Zaire Niger-Kordofanian F., Non-Mande Br. 48 TA * Tamil Tamil Nadu (S India), Sri Lanka, Malaysia, Singapore Dravidian F. 71 TE * Telugu, Telegu Andhra Pradesh (India) Dravidian F. 73 TG * Tajik, Tajiki Tadzhikstan Indo-European F., Indo-Iranian Br. 5 TH * Thai Thailand 50 TI * Tigrinya N Ethiopia Hamito-Semitic F., Semitic Br. 4 TK * Turkmen, Turkoman, Turcoman Turkmenistan, Iran, Afghanistan Uralo-Altaic F., Turkic Br. 3 TL * Tagalog Philippines Austric F., Malayo-Polynesian Br. 54 TN * Setswana South Africa TO * Tonga Niger-Kordofanian F., Non-Mande Br. 7 TR * Turkish Turkey, Bulgaria, Yugoslavia, Cyprus, Greece Uralo-Altaic F., Turkic Br. 59 TS * Tsonga 3 TT * Tatar, Tartar Tatarstan Uralo-Altaic F., Turkic Br. 8 TW * Twi, Tshi W Africa Niger-Kordofanian F., Non-Mande Br. UG * Uigur, Uighur, Uyghur Sinkiang (China), Kazakhstan, Uzbekistan, Afghanistan Uralo-Altaic F., Turkic Br. 8 See Note 5. UK * Ukrainian Ukraine, Canada, U.S.A. Indo-European F., Balto-Slavic Br. 47 UR * Urdu Pakistan, India Indo-European F., Indo-Iranian Br. 102 Same as Hindi [HI] except for writing system. See Note 3. UZ * Uzbek, Uzbeg, Usbek, Usbeg Uzbekstan, Tadzhikstan, Afghanistan Uralo-Altaic F., Turkic Br. 14 VI * Vietnamese Viet Nam, Thailand, Cambodia, Laos, New Caledonia, France, Dakar Sino-Tibetan F., Sino-Siamese Br. 65 VO * Volap?k Artificial language WO * Wolof Senegal, Gambia Niger-Kordofanian F., Non-Mande Br. 7 XH * Xhosa, Xosa, isiXhosa South Africa, Rhodesia, Swaziland Niger-Kordofanian F., Non-Mande Br. 8 YI * Yiddish U.S.A., Israel, former USSR, Latin America, Canada, E Europe Indo-European F., Germanic Br. Formerly JI from Jiddisch. See Note 4. YO * Yoruba Western, Lagos and Kwara States (Nigeria), Benin Niger-Kordofanian F., Non-Mande Br. 20 ZA Zhuang, Chwang, Chuang China 15 See Note 5. ZH * Chinese China Sino-Tibetan F., Sino-Siamese Br. 1,200 ZH from Zhongwen. See Note 1. ZU * Zulu, isiZulu South Africa, Rhodesia, Swaziland Niger-Kordofanian F., Non-Mande Br. 9 ++++++ iso639-2 ++++++ ISO 639-1 is the alpha-2 code. Multiple codes for the same language are to be considered synonyms. Entries marked with '*' have Unicode orthographies built. 639-2 639-1 Language Name (English) Language Name (French) * aar aa Afar afar * abk ab Abkhazian abkhaze ace Achinese aceh ach Acoli acoli ada Adangme adangme afa Afro-Asiatic (Other) afro-asiatiques, autres langues afh Afrihili afrihili * afr af Afrikaans afrikaans aka Akan akan akk Akkadian akkadien * alb/sqi* sq Albanian albanais ale Aleut aléoute alg Algonquian languages algonquines, langues * amh am Amharic amharique ang English, Old (ca.450-1100) anglo-saxon (ca.450-1100) apa Apache languages apache * ara ar Arabic arabe arc Aramaic araméen * arm/hye* hy Armenian arménien arn Araucanian araucan arp Arapaho arapaho art Artificial (Other) artificielles, autres langues arw Arawak arawak asm as Assamese assamais * ast Asturian; Bable asturien; bable ath Athapascan languages athapascanes, langues aus Australian languages australiennes, langues * ava Avaric avar ave ae Avestan avestique awa Awadhi awadhi * aym ay Aymara aymara * aze az Azerbaijani azéri bad Banda banda bai Bamileke languages bamilékés, langues * bak ba Bashkir bachkir bal Baluchi baloutchi * bam Bambara bambara ban Balinese balinais * baq/eus* eu Basque basque bas Basa basa bat Baltic (Other) baltiques, autres langues bej Beja bedja * bel be Belarusian biélorusse bem Bemba bemba * ben bn Bengali bengali ber Berber (Other) berbères, autres langues bho Bhojpuri bhojpuri * bih bh Bihari bihari bik Bikol bikol * bin Bini bini * bis bi Bislama bichlamar bla Siksika blackfoot bnt Bantu (Other) bantoues, autres langues * tib/bod* bo Tibetan tibétain * bos bs Bosnian bosniaque bra Braj braj * bre br Breton breton btk Batak (Indonesia) batak (Indonésie) * bua Buriat bouriate bug Buginese bugi * bul bg Bulgarian bulgare * bur/mya* my Burmese birman cad Caddo caddo cai Central American Indian (Other) indiennes d'Amérique centrale, autres langues car Carib caribe * cat ca Catalan catalan cau Caucasian (Other) caucasiennes, autres langues ceb Cebuano cebuano cel Celtic (Other) celtiques, autres langues * cze/ces* cs Czech tchèque * cha ch Chamorro chamorro chb Chibcha chibcha * che ce Chechen tchétchène chg Chagatai djaghataï * chi/zho* zh Chinese chinois chk Chuukese chuuk * chm Mari mari chn Chinook jargon chinook, jargon cho Choctaw choctaw chp Chipewyan chipewyan * chr Cherokee cherokee * chu cu Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic slavon d'église; vieux slave; slavon liturgique; vieux bulgare * chv cv Chuvash tchouvache chy Cheyenne cheyenne cmc Chamic languages chames, langues cop Coptic copte * cor kw Cornish cornique * cos co Corsican corse cpe Creoles and pidgins, English based (Other) créoles et pidgins anglais, autres cpf Creoles and pidgins, French-based (Other) créoles et pidgins français, autres cpp Creoles and pidgins, Portuguese-based (Other) créoles et pidgins portugais, autres cre Cree cree crp Creoles and pidgins (Other) créoles et pidgins divers cus Cushitic (Other) couchitiques, autres langues * wel/cym* cy Welsh gallois * cze/ces* cs Czech tchèque dak Dakota dakota * dan da Danish danois day Dayak dayak del Delaware delaware den Slave (Athapascan) esclave (athapascan) * ger/deu* de German allemand dgr Dogrib dogrib din Dinka dinka div Divehi maldivien doi Dogri dogri dra Dravidian (Other) dravidiennes, autres langues dua Duala douala dum Dutch, Middle (ca.1050-1350) néerlandais moyen (ca. 1050-1350) * dut/nld* nl Dutch néerlandais dyu Dyula dioula * dzo dz Dzongkha dzongkha efi Efik efik egy Egyptian (Ancient) égyptien eka Ekajuk ekajuk * gre/ell* el Greek, Modern (1453-) grec moderne (après 1453) elx Elamite élamite * eng en English anglais enm English, Middle (1100-1500) anglais moyen (1100-1500) * epo eo Esperanto espéranto * est et Estonian estonien * baq/eus* eu Basque basque ewe Ewe éwé ewo Ewondo éwondo fan Fang fang * fao fo Faroese féroïen * per/fas* fa Persian persan fat Fanti fanti * fij fj Fijian fidjien * fin fi Finnish finnois fiu Finno-Ugrian (Other) finno-ougriennes, autres langues fon Fon fon * fre/fra* fr French français frm French, Middle (ca.1400-1800) français moyen (1400-1800) fro French, Old (842-ca.1400) français ancien (842-ca.1400) * fry fy Frisian frison * ful Fulah peul * fur Friulian frioulan gaa Ga ga gay Gayo gayo gba Gbaya gbaya gem Germanic (Other) germaniques, autres langues * geo/kat* ka Georgian géorgien * ger/deu* de German allemand * gez Geez guèze gil Gilbertese kiribati * gla gd Gaelic; Scottish Gaelic gaélique; gaélique écossais * gle ga Irish irlandais * glg gl Gallegan galicien * glv gv Manx manx; mannois gmh German, Middle High (ca.1050-1500) allemand, moyen haut (ca. 1050-1500) goh German, Old High (ca.750-1050) allemand, vieux haut (ca. 750-1050) gon Gondi gond gor Gorontalo gorontalo got Gothic gothique grb Grebo grebo grc Greek, Ancient (to 1453) grec ancien (jusqu'à 1453) * gre/ell* el Greek, Modern (1453-) grec moderne (après 1453) * grn gn Guarani guarani * guj gu Gujarati goudjrati gwi Gwich´in gwich´in hai Haida haida * hau ha Hausa haoussa * haw Hawaiian hawaïen * heb he Hebrew hébreu her hz Herero herero hil Hiligaynon hiligaynon him Himachali himachali * hin hi Hindi hindi hit Hittite hittite hmn Hmong hmong * hmo ho Hiri Motu hiri motu * scr/hrv* hr Croatian croate * hun hu Hungarian hongrois hup Hupa hupa * arm/hye* hy Armenian arménien iba Iban iban * ibo Igbo igbo * ice/isl* is Icelandic islandais * ido io Ido ido ijo Ijo ijo * iku iu Inuktitut inuktitut * ile ie Interlingue interlingue ilo Iloko ilocano * ina ia Interlingua (International Auxiliary Language Association) interlingua (langue auxiliaire internationale) inc Indic (Other) indo-aryennes, autres langues * ind id Indonesian indonésien ine Indo-European (Other) indo-européennes, autres langues * ipk ik Inupiaq inupiaq ira Iranian (Other) iraniennes, autres langues iro Iroquoian languages iroquoises, langues (famille) * ice/isl* is Icelandic islandais * ita it Italian italien jav jv Javanese javanais * jpn ja Japanese japonais jpr Judeo-Persian judéo-persan jrb Judeo-Arabic judéo-arabe * kaa Kara-Kalpak karakalpak kab Kabyle kabyle kac Kachin kachin * kal kl Kalaallisut groenlandais kam Kamba kamba * kan kn Kannada kannada kar Karen karen * kas ks Kashmiri kashmiri * geo/kat* ka Georgian géorgien kau Kanuri kanouri kaw Kawi kawi * kaz kk Kazakh kazakh kha Khasi khasi khi Khoisan (Other) khoisan, autres langues * khm km Khmer khmer kho Khotanese khotanais * kik ki Kikuyu; Gikuyu kikuyu kin rw Kinyarwanda rwanda * kir ky Kirghiz kirghize kmb Kimbundu kimbundu * kok Konkani konkani * kom kv Komi kom kon Kongo kongo * kor ko Korean coréen kos Kosraean kosrae kpe Kpelle kpellé kro Kru krou kru Kurukh kurukh kua kj Kuanyama; Kwanyama kuanyama; kwanyama * kum Kumyk koumyk * kur ku Kurdish kurde kut Kutenai kutenai lad Ladino judéo-espagnol lah Lahnda lahnda lam Lamba lamba * lao lo Lao lao * lat la Latin latin * lav lv Latvian letton * lez Lezghian lezghien lin ln Lingala lingala * lit lt Lithuanian lituanien lol Mongo mongo loz Lozi lozi * ltz lb Luxembourgish; Letzeburgesch luxembourgeois lua Luba-Lulua luba-lulua lub Luba-Katanga luba-katanga lug Ganda ganda lui Luiseno luiseno lun Lunda lunda luo Luo (Kenya and Tanzania) luo (Kenya et Tanzanie) lus lushai Lushai * mac/mkd* mk Macedonian macédonien mad Madurese madourais mag Magahi magahi * mah mh Marshallese marshall mai Maithili maithili mak Makasar makassar * mal ml Malayalam malayalam man Mandingo mandingue * mao/mri* mi Maori maori map Austronesian (Other) malayo-polynésiennes, autres langues * mar mr Marathi marathe mas Masai massaï may/msa* ms Malay malais mdr Mandar mandar men Mende mendé mga Irish, Middle (900-1200) irlandais moyen (900-1200) mic Micmac micmac min Minangkabau minangkabau mis Miscellaneous languages diverses, langues * mac/mkd* mk Macedonian macédonien mkh Mon-Khmer (Other) môn-khmer, autres langues * mlg mg Malagasy malgache * mlt mt Maltese maltais mnc Manchu mandchou mni Manipuri manipuri mno Manobo languages manobo, langues moh Mohawk mohawk * mol mo Moldavian moldave * mon mn Mongolian mongol mos Mossi moré * mao/mri* mi Maori maori may/msa* ms Malay malais mul Multiple languages multilingue mun Munda languages mounda, langues mus Creek muskogee mwr Marwari marvari * bur/mya* my Burmese birman myn Mayan languages maya, langues nah Nahuatl nahuatl nai North American Indian indiennes d'Amérique du Nord, autres langues nau na Nauru nauruan nav nv Navajo; Navaho navaho nbl nr Ndebele, South; South Ndebele ndébélé du Sud nde nd Ndebele, North; North Ndebele ndébélé du Nord ndo ng Ndonga ndonga nds Low German; Low Saxon; German, Low; Saxon, Low bas allemand; bas saxon; allemand, bas; saxon, bas * nep ne Nepali népalais new Newari newari nia Nias nias nic Niger-Kordofanian (Other) nigéro-congolaises, autres langues niu Niuean niué * dut/nld* nl Dutch néerlandais non Norse, Old norrois, vieux * nor no Norwegian norvégien * nno nn Norwegian Nynorsk; Nynorsk, Norwegian norvégien nynorsk; nynorsk, norvégien * nob nb Norwegian Bokmål; Bokmål, Norwegian norvégien bokmål; bokmål, norvégien nso Sotho, Northern sotho du Nord nub Nubian languages nubiennes, langues * nya ny Chichewa; Chewa; Nyanja chichewa; chewa; nyanja nym Nyamwezi nyamwezi nyn Nyankole nyankolé nyo Nyoro nyoro nzi Nzima nzema * oci oc Occitan (post 1500); Provençal occitan (après 1500); provençal oji Ojibwa ojibwa * ori or Oriya oriya * orm om Oromo galla osa Osage osage * oss os Ossetian; Ossetic ossète ota Turkish, Ottoman (1500-1928) turc ottoman (1500-1928) oto Otomian languages otomangue, langues paa Papuan (Other) papoues, autres langues pag Pangasinan pangasinan pal Pahlavi pahlavi pam Pampanga pampangan pan pa Panjabi pendjabi pap Papiamento papiamento pau Palauan palau peo Persian, Old (ca.600-400 B.C.) perse, vieux (ca. 600-400 av. J.-C.) * per/fas* fa Persian persan phi Philippine (Other) philippines, autres langues phn Phoenician phénicien pli pi Pali pali * pol pl Polish polonais pon Pohnpeian pohnpei * por pt Portuguese portugais pra Prakrit languages prâkrit pro Provençal, Old (to 1500) provençal ancien (jusqu'à 1500) pus ps Pushto pachto qaa-qtz Reserved for local use réservée à l'usage local que qu Quechua quechua raj Rajasthani rajasthani rap Rapanui rapanui rar Rarotongan rarotonga roa Romance (Other) romanes, autres langues * roh rm Raeto-Romance rhéto-roman rom Romany tsigane * rum/ron* ro Romanian roumain run rn Rundi rundi * rus ru Russian russe sad Sandawe sandawe sag sg Sango sango * sah Yakut iakoute sai South American Indian (Other) indiennes d'Amérique du Sud, autres langues sal Salishan languages salish, langues sam Samaritan Aramaic samaritain * san sa Sanskrit sanskrit sas Sasak sasak sat Santali santal * scc/srp* sr Serbian serbe * sco Scots écossais * scr/hrv* hr Croatian croate * sel Selkup selkoupe sem Semitic (Other) sémitiques, autres langues sga Irish, Old (to 900) irlandais ancien (jusqu'à 900) sgn Sign Languages langues des signes shn Shan chan sid Sidamo sidamo * sin si Sinhalese singhalais sio Siouan languages sioux, langues sit Sino-Tibetan (Other) sino-tibétaines, autres langues sla Slavic (Other) slaves, autres langues * slo/slk* sk Slovak slovaque * slv sl Slovenian slovène * sma Southern Sami sami du Sud * sme se Northern Sami sami du Nord smi Sami languages (Other) sami, autres langues * smj Lule Sami sami de Lule * smn Inari Sami sami d'Inari * smo sm Samoan samoan * sms Skolt Sami sami skolt sna sn Shona shona snd sd Sindhi sindhi snk Soninke soninké sog Sogdian sogdien * som so Somali somali son Songhai songhai sot st Sotho, Southern sotho du Sud * spa es Spanish; Castilian espagnol; castillan * alb/sqi* sq Albanian albanais srd sc Sardinian sarde * scc/srp* sr Serbian serbe * sh Serbo-Croatian serbo-croate srr Serer sérère ssa Nilo-Saharan (Other) nilo-sahariennes, autres langues ssw ss Swati swati suk Sukuma sukuma sun su Sundanese soundanais sus Susu soussou sux Sumerian sumérien * swa sw Swahili swahili * swe sv Swedish suédois * syr Syriac syriaque tah ty Tahitian tahitien tai Tai (Other) thaïes, autres langues * tam ta Tamil tamoul * tat tt Tatar tatar * tel te Telugu télougou tem Timne temne ter Tereno tereno tet Tetum tetum * tgk tg Tajik tadjik * tgl tl Tagalog tagalog * tha th Thai thaï * tib/bod* bo Tibetan tibétain tig Tigre tigré * tir ti Tigrinya tigrigna tiv Tiv tiv tkl Tokelau tokelau tli Tlingit tlingit tmh Tamashek tamacheq tog Tonga (Nyasa) tonga (Nyasa) * ton to Tonga (Tonga Islands) tongan (Îles Tonga) tpi Tok Pisin tok pisin tsi Tsimshian tsimshian * tsn tn Tswana tswana * tso ts Tsonga tsonga * tuk tk Turkmen turkmène tum Tumbuka tumbuka tup Tupi languages tupi, langues * tur tr Turkish turc tut Altaic (Other) altaïques, autres langues tvl Tuvalu tuvalu * twi tw Twi twi * tyv Tuvinian touva uga Ugaritic ougaritique * uig ug Uighur ouïgour * ukr uk Ukrainian ukrainien umb Umbundu umbundu und Undetermined indéterminée * urd ur Urdu ourdou * uzb uz Uzbek ouszbek vai Vai vaï * ven Venda venda * vie vi Vietnamese vietnamien * vol vo Volapük volapük * vot Votic vote wak Wakashan languages wakashennes, langues wal Walamo walamo war Waray waray was Washo washo * wel/cym* cy Welsh gallois * wen Sorbian languages sorabes, langues * wln wa Walloon wallon * wol wo Wolof wolof * xho xh Xhosa xhosa yao Yao yao * yap Yapese yapois * yid yi Yiddish yiddish * yor yo Yoruba yoruba ypk Yupik languages yupik, langues zap Zapotec zapotèque zen Zenaga zenaga zha za Zhuang; Chuang zhuang; chuang * chi/zho* zh Chinese chinois znd Zande zandé * zul zu Zulu zoulou zun Zuni zuni ++++++ make-check.patch ++++++ diff -ru fontconfig-2.3.93.20060131.orig/test/out.expected fontconfig-2.3.93.20060131/test/out.expected --- fontconfig-2.3.93.20060131.orig/test/out.expected 2003-03-01 06:54:42.000000000 +0100 +++ fontconfig-2.3.93.20060131/test/out.expected 2006-01-31 11:50:40.000000000 +0100 @@ -1,8 +1,8 @@ -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 = -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 = -Fixed:pixelsize=16 -Fixed:pixelsize=6 +Misc Fixed:pixelsize=6 +Sony Fixed:pixelsize=16 ++++++ urw-aliases-whitespaces.patch ++++++ Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf =================================================================== --- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf +++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf @@ -9,6 +9,10 @@ <family>Avant Garde</family> <accept><family>URW Gothic L</family></accept> </alias> + <alias binding="same"> + <family>AvantGarde</family> + <accept><family>URW Gothic L</family></accept> + </alias> <alias binding="same"> <family>Bookman</family> <accept><family>URW Bookman L</family></accept> @@ -17,6 +21,10 @@ <family>New Century Schoolbook</family> <accept><family>Century Schoolbook L</family></accept> </alias> + <alias binding="same"> + <family>NewCenturySchoolbook</family> + <accept><family>Century Schoolbook L</family></accept> + </alias> <alias binding="same"> <family>Palatino</family> <accept><family>URW Palladio L</family></accept> @@ -26,9 +34,17 @@ <accept><family>URW Chancery L</family></accept> </alias> <alias binding="same"> + <family>ZapfChancery</family> + <accept><family>URW Chancery L</family></accept> + </alias> + <alias binding="same"> <family>Zapf Dingbats</family> <accept><family>Dingbats</family></accept> </alias> + <alias binding="same"> + <family>ZapfDingbats</family> + <accept><family>Dingbats</family></accept> + </alias> <match target="pattern"> <test name="family"> <string>Symbol</string> ++++++ usr-share-doc-packages.patch ++++++ Index: fontconfig-2.8.0/fc-cache/fc-cache.sgml =================================================================== --- fontconfig-2.8.0.orig/fc-cache/fc-cache.sgml 2009-11-16 18:24:52.000000000 +0100 +++ fontconfig-2.8.0/fc-cache/fc-cache.sgml 2011-01-21 11:35:19.672439060 +0100 @@ -180,7 +180,7 @@ manpage.1: manpage.sgml </para> <para>The fontconfig user's guide, in HTML format: - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> + <filename>/usr/share/doc/packages/fontconfig/fontconfig-user.html</filename>.</para> </refsect1> <refsect1> Index: fontconfig-2.8.0/fc-cat/fc-cat.sgml =================================================================== --- fontconfig-2.8.0.orig/fc-cat/fc-cat.sgml 2009-11-16 18:24:52.000000000 +0100 +++ fontconfig-2.8.0/fc-cat/fc-cat.sgml 2011-01-21 11:35:19.773439330 +0100 @@ -139,7 +139,7 @@ manpage.1: manpage.sgml </para> <para>The fontconfig user's guide, in HTML format: - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> + <filename>/usr/share/doc/packages/fontconfig/fontconfig-user.html</filename>.</para> </refsect1> <refsect1> Index: fontconfig-2.8.0/fc-list/fc-list.sgml =================================================================== --- fontconfig-2.8.0.orig/fc-list/fc-list.sgml 2009-11-16 18:24:52.000000000 +0100 +++ fontconfig-2.8.0/fc-list/fc-list.sgml 2011-01-21 11:35:19.957438963 +0100 @@ -184,7 +184,7 @@ manpage.1: manpage.sgml </para> <para>The fontconfig user's guide, in HTML format: - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> + <filename>/usr/share/doc/packages/fontconfig/fontconfig-user.html</filename>.</para> </refsect1> <refsect1> Index: fontconfig-2.8.0/fc-match/fc-match.sgml =================================================================== --- fontconfig-2.8.0.orig/fc-match/fc-match.sgml 2009-11-16 18:24:52.000000000 +0100 +++ fontconfig-2.8.0/fc-match/fc-match.sgml 2011-01-21 11:35:20.116438691 +0100 @@ -187,7 +187,7 @@ output is requested.</para> </para> <para>The fontconfig user's guide, in HTML format: - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> + <filename>/usr/share/doc/packages/fontconfig/fontconfig-user.html</filename>.</para> </refsect1> <refsect1> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1256 for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package patchinfo.1256 for openSUSE:12.2:Update checked in at 2013-01-31 16:15:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/patchinfo.1256 (Old) and /work/SRC/openSUSE:12.2:Update/.patchinfo.1256.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1256", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <packager>jdmulloy</packager> <category>recommended</category> <rating>moderate</rating> <summary>OpenLP: Update from 2.0 to 2.0.1</summary> <description>This update fixes the following issues for OpenLP: - bnc#799157: + 2.0.1: * Song export and import now works correctly * Transparent themes are once again transparent * PowerPoint/Impress files with unicode characters in the filename can be imported * OpenLP is now more usable with the XFCE desktop on Linux</description> <issue tracker="bnc" id="799157">Update OpenLP from 2.0 to 2.0.1</issue> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenLP for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package OpenLP for openSUSE:12.2:Update checked in at 2013-01-31 16:15:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/OpenLP (Old) and /work/SRC/openSUSE:12.2:Update/.OpenLP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenLP", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.Sted4b/_old 2013-01-31 16:15:43.000000000 +0100 +++ /var/tmp/diff_new_pack.Sted4b/_new 2013-01-31 16:15:43.000000000 +0100 @@ -1 +1 @@ -<link package='OpenLP.1171' cicount='copy' /> +<link package='OpenLP.1256' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit OpenLP.1256 for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package OpenLP.1256 for openSUSE:12.2:Update checked in at 2013-01-31 16:15:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/OpenLP.1256 (Old) and /work/SRC/openSUSE:12.2:Update/.OpenLP.1256.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "OpenLP.1256", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:12.2:Update/.OpenLP.1256.new/OpenLP.changes 2013-01-31 16:15:41.000000000 +0100 @@ -0,0 +1,133 @@ +------------------------------------------------------------------- +Fri Jan 25 04:39:05 UTC 2013 - jdmulloy(a)gmail.com + +- Update to 2.0.1 (bnc#799157): + * Song export and import now works correctly + * Transparent themes are once again transparent + * PowerPoint/Impress files with unicode characters in the + filename can be imported + * OpenLP is now more usable with the XFCE desktop on Linux + +------------------------------------------------------------------- +Fri Nov 30 05:45:09 UTC 2012 - jdmulloy(a)gmail.com + +- Updated to OpenLP 2.0 + * Stable release of OpenLP 2.0 + * Includes performance improvements + * Includes bugfixes for imports, presentations and VLC + * bnc#793458 + +------------------------------------------------------------------- +Tue Sep 25 03:02:02 UTC 2012 - jdmulloy(a)gmail.com + +- Updated from version 1.9.11 (2.0 RC1) to version 1.9.12 (2.0 RC2) + * Includes output alignment bug fix (lp#1034145) + * Includes other minor bugfixes + * bnc#782924 +- Deleted obsolete patch file uno-path.patch + +------------------------------------------------------------------- +Fri Aug 24 03:17:21 UTC 2012 - jdmulloy(a)gmail.com + +- Bumped version from 1.9.10 (2.0 RC1) to 1.9.11 (2.0 RC2) + * Includes various bugfixes +- Added rpmlintrc to suppress spurious RPMLINT warnings + +------------------------------------------------------------------- +Sun Jul 8 19:21:39 UTC 2012 - jdmulloy(a)gmail.com + +- Bumped version from 1.9.9 to 1.9.10 +- Removed uno-path.patch as libreoffice-pyuno has been fixed +- Fixed missing translations bug (lp#1007148) +- Fixed error in %suse_update_desktop_file argument order + +------------------------------------------------------------------- +Sat Mar 24 17:21:05 UTC 2012 - jdmulloy(a)gmail.com + +- Bumped version from 1.9.8 to 1.9.9 +- Removed openlp-1.9.8-impress-segfault-backport.patch because the + upstream release incorporates the fix + +------------------------------------------------------------------- +Mon Mar 19 03:44:31 UTC 2012 - jdmulloy(a)gmail.com + +- Added python-xdg as a dependency so that data files are always + stored in ~/.local/share/openlp + +------------------------------------------------------------------- +Sun Mar 11 02:43:12 UTC 2012 - jdmulloy(a)gmail.com + +- Changed download_files service mode to localonly to comply with + Factory rules + +------------------------------------------------------------------- +Tue Mar 6 03:45:05 UTC 2012 - jdmulloy(a)gmail.com + +- Added openlp-1.9.8-impress-segfault-backport.patch which + backports fix from upstream to bnc#748241. + Patch can be removed in the next release from upstream + +------------------------------------------------------------------- +Thu Feb 23 12:16:11 UTC 2012 - saschpe(a)suse.de + +- Actually add a tarball ;-) +- Spec file cleanup: + * Adjust dependency names to what we currently have in d:l:p / Factory + * Simplified macro usage + +------------------------------------------------------------------- +Wed Feb 22 21:01:06 UTC 2012 - jdmulloy(a)gmail.com + +- Removed download service and manually uploaded tarball for + submission to Factory + +------------------------------------------------------------------- +Tue Feb 21 03:36:07 UTC 2012 - jdmulloy(a)gmail.com + +- Cleaned up spec file to make it more readable +- Added conditional to prevent application of uno-path patch on + openSUSE > 12.1 +* Bug in libreoffice-pyuno is fixed in Factory (12.2) + +------------------------------------------------------------------- +Sun Dec 25 06:41:14 UTC 2011 - jdmulloy(a)gmail.com + +- Bumped OpenLP version from 1.9.7 to 1.9.8 +- Cleaned up spec file + +------------------------------------------------------------------- +Mon Dec 5 21:23:38 UTC 2011 - jdmulloy(a)gmail.com + +- Added uno-path.patch to make 'import uno' work +* This patch, patches the two files that call 'import uno'. + It appends the appropriate path to sys.path so that python can + find the uno module. +- Added %fdupes to %install section to resolve RPMLINT warnings + +------------------------------------------------------------------- +Thu Dec 1 01:06:52 UTC 2011 - jdmulloy(a)gmail.com +- Changed Release: tag to use %mkrel + +------------------------------------------------------------------- +Wed Nov 30 19:58:02 UTC 2011 - jdmulloy(a)gmail.com + +- Removed unessecary dependencies +* Removed libreoffice-graphicfilter and libreoffice-headless which + are part of libreoffice in OpenSuse +* Removed python-openoffice as it is not actually used by OpenLP +- Corrected dependency names +* Corrected capitalization for python-beautifulsoup +* Changed python-migrate to python-sqlalchemy-migrate +- Added libreoffice-pyuno to dependency list + +------------------------------------------------------------------- +Mon Nov 28 16:09:02 UTC 2011 - alexandre(a)exatati.com.br + +- License on SPDX format; +- Fix Group in spec file. + +------------------------------------------------------------------- +Thu Nov 24 22:18:07 UTC 2011 - alexandre(a)exatati.com.br + +- Reworked spec file; +- Work start from home:jdmulloy:openlp. New: ---- OpenLP-2.0.1.tar.gz OpenLP-rpmlintrc OpenLP.changes OpenLP.spec _service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenLP.spec ++++++ # # spec file for package OpenLP # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: OpenLP Version: 2.0.1 Release: 0 Summary: Open source Church presentation and lyrics projection application License: GPL-2.0 Group: Productivity/Multimedia/Other Url: http://openlp.org Source0: http://downloads.sourceforge.net/openlp/openlp/%{version}/%{name}-%{version… Source1: OpenLP-rpmlintrc BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: libqt4-devel BuildRequires: python-devel BuildRequires: python-distribute BuildRequires: update-desktop-files Requires: hicolor-icon-theme Requires: phonon Requires: python-Mako Requires: python-SQLAlchemy Requires: python-beautifulsoup Requires: python-chardet Requires: python-lxml Requires: python-pyenchant Requires: python-qt4 Requires: python-sqlalchemy-migrate Requires: python-xdg Recommends: libreoffice-pyuno BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else BuildArch: noarch %endif %description OpenLP is a church presentation software, for lyrics projection software, used to display slides of Songs, Bible verses, videos, images, and presentations via LibreOffice using a computer and projector. %prep %setup -q # Needed to prevent /usr/lib/python2.7/site-packages/resources from being built rm resources/__init__.py %build python setup.py build # Compile the translation files and copy them to the correct directory # Presumes you are in the base directory of OpenLP %install python setup.py install --skip-build -O1 --prefix=%{_prefix} --root=%{buildroot} install -m644 -p -D resources/images/openlp-logo-16x16.png %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/openlp.png install -m644 -p -D resources/images/openlp-logo-32x32.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/openlp.png install -m644 -p -D resources/images/openlp-logo-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/openlp.png install -m644 -p -D resources/images/openlp-logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/openlp.svg %suse_update_desktop_file -i -r openlp AudioVideo Video Player mv %{buildroot}%{_bindir}/openlp.pyw %{buildroot}%{_bindir}/openlp mkdir -p %{buildroot}%{_datadir}/openlp/i18n/ for TSFILE in resources/i18n/*.ts; do lrelease $TSFILE -qm %{buildroot}%{_datadir}/openlp/i18n/`basename $TSFILE .ts`.qm; done mkdir -p %{buildroot}%{_datadir}/mime/packages cp -p resources/openlp.xml %{buildroot}%{_datadir}/mime/packages # Deduplicate .pyc and .pyo files %fdupes %{buildroot}%{python_sitelib} %post touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null ||: update-desktop-database &> /dev/null ||: %postun touch --no-create %{_datadir}/icons/hicolor ||: gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null ||: update-desktop-database &> /dev/null ||: %files %defattr(-,root,root) %doc copyright.txt LICENSE %{_bindir}/openlp %{_datadir}/mime/packages/openlp.xml %{_datadir}/applications/openlp.desktop %{_datadir}/icons/hicolor %{_datadir}/openlp %{python_sitelib}/openlp/ %{python_sitelib}/%{name}-%{version}*.egg-info %changelog ++++++ OpenLP-rpmlintrc ++++++ addFilter("W: hidden-file-or-dir /usr/lib/python2.7/site-packages/openlp/.version") addFilter("W: python-naming-policy-not-applied") addFilter("W: suse-branding-unversioned-requires") ++++++ _service ++++++ <services> <service name="download_files" mode="localonly"/> </services>-- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit patchinfo.1248 for openSUSE:12.1:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package patchinfo.1248 for openSUSE:12.1:Update checked in at 2013-01-31 16:14:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update/patchinfo.1248 (Old) and /work/SRC/openSUSE:12.1:Update/.patchinfo.1248.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "patchinfo.1248", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _patchinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _patchinfo ++++++ <patchinfo> <packager>mvyskocil</packager> <category>recommended</category> <rating>low</rating> <summary>pure-ftpd: fix pure-ftpd login</summary> <description>This update fixes the following issues for pure-ftpd: - bnc#789833: fix pure-ftpd login - remove oes related patches have never used at openSUSE - add version to pureftpd symbol</description> <issue tracker="bnc" id="789833">Pure-ftpd login gails on pam_loginuid(pure-ftpd:session): set_loginuid</issue> </patchinfo> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pure-ftpd for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package pure-ftpd for openSUSE:12.2:Update checked in at 2013-01-31 16:14:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/pure-ftpd (Old) and /work/SRC/openSUSE:12.2:Update/.pure-ftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pure-ftpd", Maintainer is "MVyskocil(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- _link ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ <link package='pure-ftpd.1248' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pure-ftpd.1248 for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Jan '13

31 Jan '13

Hello community, here is the log from the commit of package pure-ftpd.1248 for openSUSE:12.2:Update checked in at 2013-01-31 16:14:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/pure-ftpd.1248 (Old) and /work/SRC/openSUSE:12.2:Update/.pure-ftpd.1248.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pure-ftpd.1248", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2013-01-09 19:40:42.352580873 +0100 +++ /work/SRC/openSUSE:12.2:Update/.pure-ftpd.1248.new/pure-ftpd.changes 2013-01-31 16:14:14.000000000 +0100 @@ -0,0 +1,652 @@ +------------------------------------------------------------------- +Wed Jan 23 08:48:59 UTC 2013 - mvyskocil(a)suse.com + +- fix bnc#789833: pure-ftpd login failes + * pure-ftpd-1.0.36-cap-audit-control.patch +- remove oes related patches have never used at openSUSE + * pure-ftpd-1.0.20-oes_remote_server.patch + * pure-ftpd-1.0.22-oes-bugfix-534424.patch +- change old PreReq to Requires(pre) +- add version to pureftpd symbol + +------------------------------------------------------------------- +Fri Apr 20 11:55:23 UTC 2012 - highwaystar.ru(a)gmail.com + +- spec file: fixed pure-ftpd.service file installation + +------------------------------------------------------------------- +Tue Apr 10 11:39:50 UTC 2012 - mvyskocil(a)suse.cz + +- update to 1.0.36 : + - Sync built-in glob(3) code with OpenBSD-current, and remove code we +don't use instead of ifdef'ing it. + - Repair checkproc() on Linux when support for capabitilies is +compiled in. Reported by Eric Gouyer. + - Don't read /dev/*random every time we need a value. Just use +arc4random() everywhere and seed it before we possibly chroot(). + - Add support for MFMT, with the same code as SITE UTIME. + - Support 2-arguments SITE UTIME. + - LDAP: Add LDAPDefaultHomeDirectory, suggested by Landry Breuil. + - Add SSL_OP_NO_SSLv3 to SSL options if the list of ciphers is +prefixed by -S: , needed by Brad. + - Use more paranoid compiler options whenever possible, and preliminary +uncluttering of the autoconf script. + - Try to cache locale-related data at startup after tzset(), rather +than during a session. + - Fix quota computation after rename() overwrites an existing file. +Reported by Hiramoto Koujo, thanks! + - Improved autoconf detection of -fstack-protector and -fPIE + - If 10 digits are not enough to print the size of a file in an +ls-like output, bump the max number of digits to 18. This adds support for +files up to 1 exabyte. + - Don't display dot files (except . and ..) if dot_read_ok is 0 in +donlist() - but not in sglob() yet. This change is purely cosmetic. There are +many ways to figure out if a file exists. + +- document bnc#756306: pure-ftpd umask setting not working properly + * /etc/pure-ftpd/pure-ftpd.conf contains a note about a side-effect of pam_umask + +- add native pure-ftpd.service for systemd-powered systems + +- use the same way how to start the daemon in sysvinit script and put + $remote_fs dependency + usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize + +------------------------------------------------------------------- +Wed Jun 22 08:31:38 UTC 2011 - mvyskocil(a)suse.cz + +- fix bnc#700611 - pure-ftpd fails with pam + * pure-ftpd-1.0.32-cap-audit-write.patch + +------------------------------------------------------------------- +Fri May 27 22:23:06 UTC 2011 - alexandre(a)exatati.com.br + +- Update to 1.0.32: + - Support SHA1 password hashing in MySQL and PostgreSQL backends + - Support for braces expansion in directory listings has been + disabled - Cf. CVE-2011-0418 +- Aditional changes FROM 1.0.31: + - Introduce --tlsciphersuite (-J) to set the list of allowed ciphers, + thanks to Todd Rinaldo. + - The -F switch has been documented in the built-in help. + - Shell-like escaping is now partially handled when emulating the "ls" + command. + - Use my_make_scrambled_password() instead of make_scrambled_password(). + Suggested by Arkadiusz Miskiewicz. +- Refresh and fix patch for [bnc#407363]: + - old: patch pure-ftpd-1.0.22-default_tcp_sedrcv_buffer_size.patch + - new: patch pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch +- Refresh PassivePortRange patch: + - old: pure-ftpd-1.0.21-portrange.patch + - new: pure-ftpd-1.0.32-portrange.patch + +------------------------------------------------------------------- +Mon Apr 11 11:56:20 UTC 2011 - mvyskocil(a)suse.cz + +- update to 1.0.30 + * pure-quotacheck can now work with a large number of files. + * OPTS UTF-8 is now an alias to OPTS UTF8. + * Fix a STARTTLS flaw similar to Postfix’s CVE-2011-0411. If you’re using + TLS, upgrading is recommended. + * Provide ANSI-compliant MySQL configuration example. + * Fix some issues with man pages. + +------------------------------------------------------------------- +Thu Oct 7 13:29:41 UTC 2010 - mvyskocil(a)suse.cz + +- add pure-ftpd-1.0.22-oes-bugfix-534424.patch for tracking OES patches +- use macro with_oes to determine if OES patches might be applied or not + +------------------------------------------------------------------- +Tue Sep 14 18:24:00 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Use with-rfc2640 [bnc#638626] + +------------------------------------------------------------------- +Tue Jul 20 15:32:37 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- add missing buildRequires on libcap-devel + +------------------------------------------------------------------- +Tue May 25 13:10:33 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- $remote_fs --> network-remotefs + +------------------------------------------------------------------- +Fri May 14 18:34:37 UTC 2010 - alexandre(a)exatati.com.br + +- Added "--with-virtualchroot" option; +- Spec file cleaned with spec-cleaner; +- updated to version 1.0.29: + - max_dlmap_size was size_t instead off_t, causing misalignment while + downloading > 4 Gb files on a 32-bits arch. + - pread() vs lseek()+read() was a useless optimization, since pread() + doesn't change the file position and further reads weren't going through + plain read() calls. + - iconv_fd_* should be initialized by (iconv_t) -1 as we test them upon + exit. Fixes segfaults on glibc. + - pure-uploadscript tries to reach the pipe during 30 seconds instead of 10. +- changes in version 1.0.28: + - FTPD_PAM_SERVICE_NAME can be defined in order to change the PAM service + name. + - When an upload gets renamed (--autorename), send the new name to the + uploadscript instead of the original one. + - The ALLO command now checks for the actual disk space in addition to the + virtal quota. + - Work around OSX broken poll() + - After an atomic resumed upload, don't append the previous file size to the + quota. + - Always accept OPTS UTF8 ON, but refuse OPTS UTF8 OFF if client_charset is + UTF8. + - Fix AUTHD_ENCRYPTED + - Reset the CWD failures counter after a successful directory has been + created. It avoids spurious disconnections with ncftp. + - Support for iPhone has been moved to another branch. + - Fix crash with PostgreSQL. + +------------------------------------------------------------------- +Fri Feb 12 15:27:50 UTC 2010 - mseben(a)novell.com + +- updated to version 1.0.27: + - Have pureftpd_shutdown() shut the server down even if a client is + connected on iPhone. + - Allow users with no quota to delete .pureftpd-upload-* files. + - Unbreak ipv6 support, reported by Brad Smith. + - Disable SSLv3 renegotiation if an old SSL library is used. If you really + want to re-enable SSLv3 renegotiation, even with a recent library, you can + always define ACCEPT_SSL_RENEGOTIATION. +- changes in version 1.0.26: + - Fix incompatibilities with Cyberduck when TLS is enabled. + - Don't TLS_accept() immediately after accept(). Reply on the connection + socket first, so that clients don't have to wait before knowing that they + can actually use TLS. It avoids lags with LFTP and hangs with Cyberduck. + - Properly change the process name on Linux when the -S option is used, by + Margus Kaidja. + - Unbreak authentication of non-chrooted users. Thanks to Juergen Daubert + for the bug report. +- changes in version 1.0.25: + - Show symlinks as symlinks in MLSD, except when the broken client + compatibility mode is turned on and links are not dangling (just like the + old LIST and NLIST commands). Reported by Mime Cuvalo. + - More gcc 2 compatibility, thanks to Todd Rinaldo. + - Properly handle custom paths in man pages. Thanks to Scott Haneda and + Mathieu Parisot. + - Have $localstatedir default to /var as it used to be unless + --localstatedir=... is explicitely passed to ./configure + - Use @VERSION@ in man pages. + - --without-pam disables PAM on OSX and iPhone. + - Allow cross-compilation. + - Experimental iPhone target. + - Change the way it links, building a library first. + - Don't use mmap() any more for downloads. It's too slow. + - Don't use hard-coded paths in order to find MySQL and PostgreSQL + libraries and header files. Use mysql_config and pg_config instead. + Suggested by John Alberts. + - Log the DELE command similar to the RETR and STOR commands. Suggested by + Martin Fuxa. + - The primary group gets cached so that it's always displayed in directory + listings. + - Avoid a client process to burn CPU in an infinite loop if the command + channel gets disconnected before the data channel. Reported by Thomas Min + and Margus Kaidja. + - Restore the traditional behavior of a download restarting at the end of a + file. For some weird reasons, some clients still insist on doing that. Don't + send a 55x return code, just let them download... nothing. + - Documentation updates. +- changes in version 1.0.24: + - Refuse empty passwords in LDAP bind mode. Reported by Henning Brauer. ++++ 455 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.pure-ftpd.1248.new/pure-ftpd.changes New: ---- pure-ftpd-1.0.20_config.patch pure-ftpd-1.0.20_doc.patch pure-ftpd-1.0.20_ftpwho_path.patch pure-ftpd-1.0.20_virtualhosts.patch pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch pure-ftpd-1.0.32-portrange.patch pure-ftpd-1.0.36-cap-audit-control.patch pure-ftpd-1.0.36.tar.bz2 pure-ftpd.changes pure-ftpd.firewall pure-ftpd.init pure-ftpd.pamd pure-ftpd.service pure-ftpd.spec pure-ftpd.xinetd pure-ftpd.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ # # spec file for package pure-ftpd # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: pure-ftpd Version: 1.0.36 Release: 0 Summary: A Lightweight, Fast, and Secure FTP Server License: BSD-3-Clause Group: Productivity/Networking/Ftp/Servers Url: http://www.pureftpd.org Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.xinetd Source4: %{name}.xml Source5: %{name}.firewall #http://pkgs.fedoraproject.org/gitweb/?p=pure-ftpd.git;a=blob_plain;f=pure-ftpd.service Source6: pure-ftpd.service # PATCH-FEATURE-OPENSUSE %{name}-1.0.20_config.patch -- Custom service configs. Patch: %{name}-1.0.20_config.patch # PATCH-FEATURE-OPENSUSE %{name}-1.0.20_doc.patch -- Adjust command paths on documentation. Patch1: %{name}-1.0.20_doc.patch # PATCH-FEATURE-OPENSUSE %{name}-1.0.20_virtualhosts.patch -- Custom VHOST_PATH on openSUSE. Patch2: %{name}-1.0.20_virtualhosts.patch Patch5: %{name}-1.0.20_ftpwho_path.patch # PATCH-FIX-UPSTREAM %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch Patch7: %{name}-1.0.32-default_tcp_sedrcv_buffer_size.patch # PATCH-FEATURE-OPENSUSE %{name}-1.0.32-portrange.patch -- Add PassivePortRange to "%numpairc_switch_for". Patch8: %{name}-1.0.32-portrange.patch # PATCH-FIX-OPENSUSE: bnc#789833 # won't be upstreamed, can be dropped when systemd will be only one init system and kernel get AUDIT_LOGINUID_IMMUTABLE Patch9: pure-ftpd-1.0.36-cap-audit-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libcap-devel BuildRequires: mysql-devel BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: postgresql-devel Requires(pre): %insserv_prereq Requires(pre): coreutils Provides: ftp-server Provides: pureftpd = %{version}-%{release} %{!?_initddir: %global _initddir /etc/init.d} %if 0%{?suse_version} > 1140 BuildRequires: systemd %{?systemd_requires} %define have_systemd 1 %endif %description Pure-FTPd is a fast, production-quality, and standard-conforming FTP server, based-on Troll-FTPd. Unlike other popular FTP servers, it has no known security flaws, is trivial to set up, and is especially designed for modern Linux kernels (setfsuid and sendfile capabilities) . Features include: PAM support, IPv6, chroot()ed home directories, virtual domains, built-in LS, anti-warez system, bandwidth throttling, FXP, bounded ports for passive downloads, upload and download ratios, Apache log files, and more. %prep %setup -q %patch %patch1 %patch2 %patch5 %patch7 %patch8 %patch9 -p1 %build CFLAGS="%{optflags} -DLDAP_DEPRECATED -fstack-protector" %configure --with-rfc2640 \ --sysconfdir=%{_sysconfdir}/%{name} \ --with-ldap \ --with-paranoidmsg \ --with-altlog \ --with-virtualhosts \ --with-ftpwho \ --with-mysql \ --with-nonalnum \ --with-pgsql \ --with-cookie \ --with-throttling \ --with-ratios \ --with-uploadscript \ --with-diraliases \ --with-pam \ --with-puredb \ --with-sysquotas \ --with-quotas \ --with-inetd \ --with-tls \ --with-boring \ --with-peruserlimits \ --with-largefile %_target_cpu-suse-linux \ --with-virtualchroot %{__make} cat configuration-file/pure-config.pl |grep -v "^print" | grep -v "^exec" > configuration-file/pure-config-args echo "print join(\" \", @flg);" >> configuration-file/pure-config-args %install %makeinstall %{__install} -dD -m 0755 \ %{buildroot}%{_sysconfdir}/{init.d,%{name},%{name}/vhosts,pam.d,xinetd.d,openldap/schema} %{__install} -m 0755 \ configuration-file/pure-config.pl \ configuration-file/pure-config-args \ %{buildroot}%{_sbindir} %{__install} -m 0644 configuration-file/pure-ftpd.conf \ %{buildroot}%{_sysconfdir}/%{name} %{__install} -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} ln -sf /etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %{__install} -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/pure-ftpd %{__install} -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/xinetd.d/pure-ftpd %{__install} -m 0644 pureftpd.schema %{buildroot}%{_sysconfdir}/openldap/schema/ %{__install} -d %{buildroot}%{_datadir}/omc/svcinfo.d/ %{__install} -m 0644 %{S:4} %{buildroot}%{_datadir}/omc/svcinfo.d/ %{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ %{__install} -m 644 %{S:5} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name %if 0%{?have_systemd} %{__install} -D -m0644 %{S:6} %{buildroot}%{_unitdir}/%{name}.service %endif %clean %{__rm} -rf %{buildroot} %pre %if 0%{?have_systemd} %service_add_pre %{name}.service %endif %preun %stop_on_removal %{name} %if 0%{?have_systemd} %service_del_preun %{name}.service %endif %post if [ -f etc/pure-ftpd.conf ]; then mv etc/pure-ftpd.conf etc/pure-ftpd/pure-ftpd.conf fi %if 0%{?have_systemd} %service_add_post %{name}.service %endif %postun %insserv_cleanup %restart_on_update %{name} %if 0%{?have_systemd} %service_del_postun %{name}.service %endif %files %defattr(-, root, root) %{_datadir}/omc/svcinfo.d/%name.xml %doc AUTHORS CONTACT COPYING NEWS THANKS README README.Contrib %doc README.Configuration-File HISTORY README.Virtual-Users %doc README.LDAP pureftpd-ldap.conf README.MySQL README.PGSQL README.TLS %{_mandir}/man8/* %{_bindir}/* %{_sbindir}/* %dir %{_sysconfdir}/openldap %dir %{_sysconfdir}/openldap/schema %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/vhosts %config %{_sysconfdir}/openldap/schema/pureftpd.schema %config %{_sysconfdir}/init.d/pure-ftpd %config %{_sysconfdir}/pam.d/pure-ftpd %config(noreplace) %{_sysconfdir}/%{name}/pure-ftpd.conf %config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name %if 0%{?have_systemd} %{_unitdir}/%{name}.service %endif %changelog ++++++ pure-ftpd-1.0.20_config.patch ++++++ Index: configuration-file/pure-ftpd.conf.in =================================================================== --- configuration-file/pure-ftpd.conf.in.orig 2012-04-10 13:13:50.172790238 +0200 +++ configuration-file/pure-ftpd.conf.in 2012-04-10 13:28:29.870404545 +0200 @@ -37,7 +37,7 @@ # Maximum number of simultaneous users -MaxClientsNumber 50 +MaxClientsNumber 10 @@ -49,7 +49,7 @@ # Maximum number of sim clients with the same IP address -MaxClientsPerIP 8 +MaxClientsPerIP 3 @@ -59,6 +59,9 @@ VerboseLog no +# Allow dot-files +AllowDotFiles yes + # List dot-files even when the client doesn't send "-a". @@ -68,7 +71,7 @@ # Don't allow authenticated users - have a public anonymous FTP only. -AnonymousOnly no +AnonymousOnly yes @@ -107,23 +110,23 @@ # LDAP configuration file (see README.LDAP) -# LDAPConfigFile /etc/pureftpd-ldap.conf +# LDAPConfigFile /etc/pure-ftpd/pureftpd-ldap.conf # MySQL configuration file (see README.MySQL) -# MySQLConfigFile /etc/pureftpd-mysql.conf +# MySQLConfigFile /etc/pure-ftpd/pureftpd-mysql.conf # Postgres configuration file (see README.PGSQL) -# PGSQLConfigFile /etc/pureftpd-pgsql.conf +# PGSQLConfigFile /etc/pure-ftpd/pureftpd-pgsql.conf # PureDB user database (see README.Virtual-Users) -# PureDB /etc/pureftpd.pdb +# PureDB /etc/pure-ftpd/pureftpd.pdb # Path to pure-authd socket (see README.Authentication-Modules) @@ -134,7 +137,7 @@ # If you want to enable PAM authentication, uncomment the following line -# PAMAuthentication yes +PAMAuthentication yes @@ -177,7 +180,7 @@ # Port range for passive connections replies. - for firewalling. -# PassivePortRange 30000 50000 +PassivePortRange 30000 30100 @@ -230,14 +233,26 @@ # File creation mask. <umask for files>:<umask for dirs> . # 177:077 if you feel paranoid. +# Note: on SUSE systems umask is overrided by pam_umask inherited from +# /etc/pam.d/common-session. In case the system-wide default does not +# fit you, you can either +# +# 1.) add line 'session optional pam_umask.so umask=$value' into +# /etc/pam.d/pure-ftpd, so all changes in common-session will apply +# for pure-ftpd as well, but config file will be still ignored +# +# 2.) replace the line 'session include common-session' in +# /etc/pam.d/pure-ftpd by the content of /etc/pam.d/common-session, +# remove the line 'session optional pam_umask.so' and uncomment the +# line below -Umask 133:022 +#Umask 177:077 # Minimum UID for an authenticated user to log in. -MinUID 100 +MinUID 40 @@ -257,7 +272,7 @@ # even if they own them. If TrustedGID is enabled, this group # will have access to dot-files, though. -ProhibitDotFilesWrite no +ProhibitDotFilesWrite yes @@ -270,13 +285,13 @@ # Never overwrite files. When a file whose name already exist is uploaded, # it get automatically renamed to file.1, file.2, file.3, ... -AutoRename no +AutoRename yes # Disallow anonymous users to upload new files (no = upload is allowed) -AnonymousCantUpload no +AnonymousCantUpload yes @@ -373,7 +388,7 @@ # Set to 'yes' if you don't want your users to rename files. -#NoRename yes +NoRename yes @@ -449,3 +464,4 @@ # FileSystemCharset big5 # ClientCharset big5 + Index: pureftpd-mysql.conf =================================================================== --- pureftpd-mysql.conf.orig 2012-04-10 13:13:50.172790238 +0200 +++ pureftpd-mysql.conf 2012-04-10 13:13:55.839987609 +0200 @@ -19,17 +19,18 @@ # Optional : define the location of mysql.sock if the server runs on this host. -MYSQLSocket /tmp/mysql.sock +MYSQLSocket /var/lib/mysql/mysql.sock # Mandatory : user to bind the server as. - -MYSQLUser root - +# +# using the Database root user is always a bad idea. +# +MYSQLUser ftpd # Mandatory : user password. You must have a password. -MYSQLPassword rootpw +MYSQLPassword ftpdpw # Mandatory : database to open. Index: pureftpd-pgsql.conf =================================================================== --- pureftpd-pgsql.conf.orig 2012-04-10 13:13:50.172790238 +0200 +++ pureftpd-pgsql.conf 2012-04-10 13:13:55.840987643 +0200 @@ -16,6 +16,7 @@ # PGSQLPort .s.PGSQL.5432 # Mandatory : user to bind the server as. + PGSQLUser postgres # Mandatory : user password. You *must* have a password. ++++++ pure-ftpd-1.0.20_doc.patch ++++++ only in patch2: unchanged: ================================================================================ --- README.Configuration-File +++ README.Configuration-File @@ -3,12 +3,12 @@ flag is designed to speed up highly loaded servers, by avoiding DNS lookups. To enable this, just add it to the server name: -/usr/local/sbin/pure-ftpd -H +/usr/sbin/pure-ftpd -H Alternative long options are also supported. Here's an equivalent of the previous command: -/usr/local/sbin/pure-ftpd --dontresolve +/usr/sbin/pure-ftpd --dontresolve But you can use traditional configuration files over command-line options. Adding a parser for configuration files in the server is a bad @@ -22,16 +22,17 @@ configuration file called 'pure-ftpd.conf' to a suitable location, say /etc: cd configuration-files -cp pure-ftpd.conf /etc +mkdir /etc/pure-ftpd/ +cp pure-ftpd.conf /etc/pure-ftpd/ -Edit /etc/pure-ftpd.conf according to your needs. +Edit /etc/pure-ftpd/pure-ftpd.conf according to your needs. Then, to start the server, just run the following command: chmod 755 pure-config.pl ./pure-config.pl /etc/pure-ftpd.conf -This is a simple Perl script that will run /usr/local/sbin/pure-ftpd with +This is a simple Perl script that will run /usr/sbin/pure-ftpd with the right options, according to the configuration file. And because there's a Python vs. Perl friendly war since ages, we also ++++++ pure-ftpd-1.0.20_ftpwho_path.patch ++++++ Index: src/ftpwho-update.h =================================================================== --- src/ftpwho-update.h.orig +++ src/ftpwho-update.h @@ -26,6 +26,9 @@ typedef struct FTPWhoEntry_ { volatile off_t download_total_size; volatile off_t download_current_size; char account[MAX_USER_LENGTH + 1U]; +#ifdef PATH_MAX + char filename[PATH_MAX]; +#else #if defined(__OpenBSD__) char filename[1024]; #else @@ -39,6 +42,7 @@ typedef struct FTPWhoEntry_ { char filename[1024]; # endif #endif +#endif } FTPWhoEntry; int ftpwho_initwho(void); ++++++ pure-ftpd-1.0.20_virtualhosts.patch ++++++ Index: src/ftpd.h =================================================================== --- src/ftpd.h.orig 2012-04-10 13:13:50.081787071 +0200 +++ src/ftpd.h 2012-04-10 13:15:02.434306712 +0200 @@ -411,7 +411,7 @@ #endif #ifndef VHOST_PATH -# define VHOST_PATH CONFDIR "/pure-ftpd" +# define VHOST_PATH CONFDIR "/vhosts" #endif #ifdef WITH_TLS ++++++ pure-ftpd-1.0.32-default_tcp_sedrcv_buffer_size.patch ++++++ Index: configure =================================================================== --- configure.orig 2012-04-10 13:11:53.944741960 +0200 +++ configure 2012-04-10 13:12:09.310277199 +0200 @@ -12650,107 +12650,12 @@ $as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default TCP send buffer size" >&5 -$as_echo_n "checking default TCP send buffer size... " >&6; } -if test "$cross_compiling" = yes; then : - CONF_TCP_SO_SNDBUF=65536 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdio.h> -#ifdef STDC_HEADERS -# include <stdlib.h> -# include <stddef.h> -#else -# if HAVE_STDLIB_H -# include <stdlib.h> -# endif -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -int main(void) -{ - int fd,val=0,len=sizeof(int); - if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) return 1; - if (getsockopt(fd, SOL_SOCKET, SO_SNDBUF, &val, &len) < 0) return 1; - if (val <= 0) return 1; - fprintf (fopen("conftestval", "w"), "%d\n", val); - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - CONF_TCP_SO_SNDBUF=`cat conftestval` -else - CONF_TCP_SO_SNDBUF=65536 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_TCP_SO_SNDBUF" >&5 -$as_echo "$CONF_TCP_SO_SNDBUF" >&6; } - - cat >>confdefs.h <<_ACEOF -#define CONF_TCP_SO_SNDBUF $CONF_TCP_SO_SNDBUF +#define CONF_TCP_SO_SNDBUF 65536 _ACEOF - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking default TCP receive buffer size" >&5 -$as_echo_n "checking default TCP receive buffer size... " >&6; } -if test "$cross_compiling" = yes; then : - CONF_TCP_SO_RCVBUF=65536 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include <stdio.h> -#ifdef STDC_HEADERS -# include <stdlib.h> -# include <stddef.h> -#else -# if HAVE_STDLIB_H -# include <stdlib.h> -# endif -#endif -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -int main(void) -{ - int fd,val=0,len=sizeof(int); - if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) return 1; - if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &val, &len) < 0) return 1; - if (val <= 0) return 1; - fprintf (fopen("conftestval", "w"), "%d\n", val); - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - CONF_TCP_SO_RCVBUF=`cat conftestval` -else - CONF_TCP_SO_RCVBUF=65536 -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CONF_TCP_SO_RCVBUF" >&5 -$as_echo "$CONF_TCP_SO_RCVBUF" >&6; } - - cat >>confdefs.h <<_ACEOF -#define CONF_TCP_SO_RCVBUF $CONF_TCP_SO_RCVBUF +#define CONF_TCP_SO_RCVBUF 65536 _ACEOF ++++++ pure-ftpd-1.0.32-portrange.patch ++++++ Index: configuration-file/pure-config.pl.in =================================================================== --- configuration-file/pure-config.pl.in.orig +++ configuration-file/pure-config.pl.in @@ -81,9 +81,10 @@ my %numpairb_switch_for = ( ); my %numpairc_switch_for = ( - Umask => "-U", - Quota => "-n", - PerUserLimits => "-y", + Umask => "-U", + Quota => "-n", + PerUserLimits => "-y", + PassivePortRange => "-p", ); my %auth_method_for = ( ++++++ pure-ftpd-1.0.36-cap-audit-control.patch ++++++ Index: pure-ftpd-1.0.36/src/caps_p.h =================================================================== --- pure-ftpd-1.0.36.orig/src/caps_p.h +++ pure-ftpd-1.0.36/src/caps_p.h @@ -7,7 +7,8 @@ # endif cap_value_t cap_keep_startup[] = { -# if defined(USE_PAM) && defined(CAP_AUDIT_WRITE) +# if defined(USE_PAM) && defined(CAP_AUDIT_CONTROL) && defined(CAP_AUDIT_WRITE) + CAP_AUDIT_CONTROL, CAP_AUDIT_WRITE, # endif CAP_SETGID, ++++++ pure-ftpd.firewall ++++++ ## Name: pureftpd ## Description: Opens ports for pureftpd with broadcast allowed. # space separated list of allowed TCP ports TCP="ftp 30000:30100" # space separated list of allowed UDP ports UDP="" # space separated list of allowed RPC services RPC="" # space separated list of allowed IP protocols IP="" # space separated list of allowed UDP broadcast ports BROADCAST="" ++++++ pure-ftpd.init ++++++ #! /bin/sh # Copyright (c) 2001, 2002 SuSE GmbH Nuernberg, Germany. # # Author: Thorsten Kukuk <feedback(a)suse.de> # # /etc/init.d/pure-ftpd # # and symbolic its link # # /usr/sbin/rcpure-ftpd # # System startup script for the pure ftp daemon # ### BEGIN INIT INFO # Provides: pure-ftpd # Required-Start: network-remotefs $syslog $remote_fs # Required-Stop: network-remotefs $syslog $remote_fs # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start pure-ftpd ftp server. # Description: Start pure-ftpd ftp server. ### END INIT INFO FTPD_BIN=/usr/sbin/pure-ftpd test -x $FTPD_BIN || exit 5 # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. case "$1" in start) echo -n "Starting pure-ftpd" #FTPD_ARGS=`/usr/sbin/pure-config-args /etc/pure-ftpd/pure-ftpd.conf` #startproc $FTPD_BIN $FTPD_ARGS startproc /usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize rc_status -v ;; stop) echo -n "Shutting down pure-ftpd" killproc -G -TERM $FTPD_BIN rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) ## Stop the service and regardless of whether it was ## running or not, start it again. $0 stop $0 start rc_status ;; force-reload) ## Signal the daemon to reload its config. Most daemons ## do this on signal 1 (SIGHUP). ## If it does not support it, restart. echo -n "Reload service pure-ftpd" $0 stop && $0 start rc_status ;; reload) ## Like force-reload, but if daemon does not support ## signalling, do nothing (!) echo -n "Reload service pure-ftpd" rc_failed 3 rc_status -v ;; status) echo -n "Checking for pure-ftpd: " ## Check status with checkproc(8), if process is running ## checkproc will return with exit status 0. # Status has a slightly different for the status command: # 0 - service running # 1 - service dead, but /var/run/ pid file exists # 2 - service dead, but /var/lock/ lock file exists # 3 - service not running # NOTE: checkproc returns LSB compliant status values. checkproc $FTPD_BIN rc_status -v ;; probe) test /etc/pure-ftpd/pure-ftpd.conf -nt /var/run/pure-ftpd.pid && \ echo restart ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ pure-ftpd.pamd ++++++ #%PAM-1.0 auth required pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed auth required pam_shells.so auth include common-auth account include common-account password include common-password session required pam_loginuid.so session include common-session ++++++ pure-ftpd.service ++++++ [Unit] Description=Pure-FTPd FTP server After=syslog.target network.target [Service] Type=forking PIDFile=/var/run/pure-ftpd.pid ExecStart=/usr/sbin/pure-config.pl /etc/pure-ftpd/pure-ftpd.conf --daemonize [Install] WantedBy=multi-user.target ++++++ pure-ftpd.xinetd ++++++ # default: off # description: The ftpd server serves FTP connections. It uses normal, \ # unencrypted usernames and passwords for authentication. This ftpd is \ # the pure-ftpd. # ** NOTE ** when using pure-ftpd from xinetd the arguments to control # it's behaviour should be added here in this file in the # "server_args" line since the configuration file # /etc/pure-ftpd.conf is only for standalone pure-ftpd. # The command "/usr/sbin/pure-config-args /etc/pure-ftpd.conf" # will print the arguments needed for behaviour like standalone # pure-ftpd. service ftp { socket_type = stream server = /usr/sbin/pure-ftpd # server_args = protocol = tcp user = root wait = no disable = yes } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0