- updated to 3.8.22

- removed obsolete no_dupl_DESDIR and gcc33 patches
- updated ac_fixes, pl.po, types patches
- one more fix added to missing-nls patch
- added SSL-related dirs
- ...and configure options to keep using config files where they still are

Changed files:
    LPRng-ac_fixes.patch -> 1.13
    LPRng-gcc33.patch -> 1.2
    LPRng-missing-nls.patch -> 1.2
    LPRng-no_dupl_DESDIR.patch -> 1.2
    LPRng-pl.po.patch -> 1.4
    LPRng-types.patch -> 1.3
    LPRng.spec -> 1.109

diff --git a/LPRng-ac_fixes.patch b/LPRng-ac_fixes.patch
index f6e15e58a7e8023becc1fa82b027d707b0ab08aa..b4b2b1a356fdda551ce6515bae7bdfbf87dd5a56 100644 (file)
--- a/LPRng-ac_fixes.patch
+++ b/LPRng-ac_fixes.patch
@@ -1,19 +1,13 @@
-diff -Nur LPRng-3.8.19.orig/configure.in LPRng-3.8.19/configure.in
---- LPRng-3.8.19.orig/configure.in     Mon Aug 12 01:57:28 2002
-+++ LPRng-3.8.19/configure.in  Mon Nov  4 14:08:10 2002
-@@ -21,41 +21,23 @@
- AC_SUBST(VERSION)
- ALL_LINGUAS="fr"
+--- LPRng-3.8.22/configure.in.orig     2003-09-05 22:07:14.000000000 +0200
++++ LPRng-3.8.22/configure.in  2003-11-13 08:01:15.384297944 +0100
+@@ -27,38 +27,18 @@
+ WITH_LOCALEDIR dnl
+ export LOCALEDIR
  
 -WITH_CCOPTS dnl
 -WITH_CPPOPTS dnl
 -WITH_LDOPTS dnl
- if test -z "$LOCALEDIR" ; then
-     LOCALEDIR='${prefix}/share/locale'
- fi;
- WITH_LOCALEDIR dnl
- export LOCALEDIR
- 
+-
 -AC_PREFIX_DEFAULT(/usr/local)
 -AC_SUBST(INSTALL)
 -AC_SUBST(INSTALL_MAN)
@@ -28,6 +22,8 @@ diff -Nur LPRng-3.8.19.orig/configure.in LPRng-3.8.19/configure.in
  dnl check for awk
  AC_PROG_AWK
 -AC_SUBST(AWK)
+-AC_PATH_PROG(SED,sed)dnl
+-AC_SUBST(SED)dnl
 -AC_PATH_PROG(PERL,perl)dnl
 -AC_SUBST(PERL)dnl
 -AC_PATH_PROG(CHOWN,chown)dnl
@@ -40,18 +36,19 @@ diff -Nur LPRng-3.8.19.orig/configure.in LPRng-3.8.19/configure.in
 -AC_SUBST(OPENSSL)dnl
 -AC_PATH_PROG(PGP_PATH,pgp)dnl
 -AC_SUBST(PGP_PATH)dnl
++AC_PATH_PROG(SED,sed)
 +AC_PATH_PROG(PERL,perl)
 +AC_PATH_PROG(CHOWN,chown)
 +AC_PATH_PROG(CHGRP,chgrp)
 +AC_PATH_PROG(PRUTIL,pr)
 +AC_PATH_PROG(OPENSSL,openssl)
 +AC_PATH_PROG(PGP_PATH,pgp)
- AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP_PATH")
+ AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP_PATH",[pgp path])
  
  
-@@ -426,22 +408,8 @@
- AC_MSG_RESULT($FILTER_DIR)
- AC_SUBST(FILTER_DIR)
+@@ -448,22 +428,8 @@
+ )
+ AC_MSG_RESULT($v)
  
 -dnl default strip binaries 
 -AC_MSG_CHECKING(disable stripped binaries)
@@ -74,7 +71,7 @@ diff -Nur LPRng-3.8.19.orig/configure.in LPRng-3.8.19/configure.in
  AC_SUBST(STRIP_OPTION)
  
  dnl ----------------------------------------------------------------------------
-@@ -1836,8 +1804,8 @@
+@@ -1829,8 +1795,8 @@
  
  
  if test "$ac_cv_prog_gcc" = yes; then
@@ -84,4 +81,13 @@ diff -Nur LPRng-3.8.19.orig/configure.in LPRng-3.8.19/configure.in
 +      CPPFLAGS="$CPPFLAGS -W -Wall $werror -Wno-unused "
  fi;
  
- AC_OUTPUT(
+ AC_OUTPUT( po/Makefile.in 
+@@ -1799,7 +1799,7 @@
+       CPPFLAGS="$CPPFLAGS -W -Wall $werror -Wno-unused "
+ fi;
+ 
+-AC_OUTPUT( po/Makefile.in 
++AC_OUTPUT(
+ [
+ Makefile
+ DOCS/Makefile

diff --git a/LPRng-gcc33.patch b/LPRng-gcc33.patch
deleted file mode 100644 (file)
index 891282a..0000000
--- a/LPRng-gcc33.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- LPRng-3.8.21/src/common/lpf.c.orig 2003-04-16 01:37:42.000000000 +0200
-+++ LPRng-3.8.21/src/common/lpf.c      2003-08-06 00:21:26.000000000 +0200
-@@ -188,7 +188,7 @@
- int crlf;     /* change lf to CRLF */
- 
- void getargs( int argc, char *argv[], char *envp[] );
--void log( char *msg, ... );
-+void lognerr( char *msg, ... );
- void logerr( char *msg, ... );
- void logerr_die( char *msg, ... );
- void fatal( char *msg, ... );
-@@ -312,9 +312,9 @@
- }
- 
- #ifdef HAVE_STDARGS
--void log(char *msg, ...)
-+void lognerr(char *msg, ...)
- #else
--void log( va_alist ) va_dcl
-+void lognerr( va_alist ) va_dcl
- #endif
- {
- #ifndef HAVE_STDARGS

diff --git a/LPRng-missing-nls.patch b/LPRng-missing-nls.patch
index 8be809c7aed8d803b831bfb36639d80714276de4..b32020f670ec12d1eb692222241e60b337a4424a 100644 (file)
--- a/LPRng-missing-nls.patch
+++ b/LPRng-missing-nls.patch
@@ -145,3 +145,14 @@
  src/common/sendjob.c
  src/common/sendmail.c
  src/common/sendreq.c
+--- LPRng-3.8.22/src/common/lpd_status.c.orig  2003-11-13 21:32:25.000000000 +0100
++++ LPRng-3.8.22/src/common/lpd_status.c       2003-11-13 21:41:55.840610760 +0100
+@@ -467,7 +467,7 @@
+       end_of_name = 0;
+       if( displayformat != REQ_DSHORT ){
+               SNPRINTF( header, sizeof(header)) "%s: ",
+-                      Server_queue_name_DYN?"Server Printer":"Printer" );
++                      Server_queue_name_DYN?_("Server Printer"):_("Printer") );
+       }
+       len = safestrlen(header);
+       SNPRINTF( header+len, sizeof(header)-len) "%s@%s",

diff --git a/LPRng-no_dupl_DESDIR.patch b/LPRng-no_dupl_DESDIR.patch
deleted file mode 100644 (file)
index af1ad9b..0000000
--- a/LPRng-no_dupl_DESDIR.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- LPRng-3.8.15/Makefile.in~  Sun Nov 24 00:49:04 2002
-+++ LPRng-3.8.15/Makefile.in   Sun Nov 24 00:49:04 2002
-@@ -117,7 +117,7 @@
- ###############################################################################
- $(ALLDIRS):
-       if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
--              cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
-+              cd $@; $(MAKE) localedir=${LOCALEDIR} \
-                       DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
-       fi
- 

diff --git a/LPRng-pl.po.patch b/LPRng-pl.po.patch
index 5a1a768e8b5320f791978eb901b517ca72176742..d8cb20c050a29ac97e8202b6fb4f845007524534 100644 (file)
--- a/LPRng-pl.po.patch
+++ b/LPRng-pl.po.patch
@@ -9,19 +9,20 @@
  
  if test -z "$LOCALEDIR" ; then
      LOCALEDIR='${prefix}/share/locale'
---- LPRng-3.8.20/po/pl.po.orig Thu Jan  1 01:00:00 1970
-+++ LPRng-3.8.20/po/pl.po      Tue Feb 25 20:09:15 2003
-@@ -0,0 +1,2255 @@
+--- LPRng-3.8.22/po/pl.po.orig 2003-11-13 21:42:08.581673824 +0100
++++ LPRng-3.8.22/po/pl.po      2003-11-13 21:51:29.539395288 +0100
+@@ -0,0 +1,2268 @@
 +# Polish translations for LPRng
-+# Jakub Bogusz <qboosh@pld.org.pl>, 2002.
++# Jakub Bogusz <qboosh@pld-linux.org>, 2002-2003.
 +#
 +#: src/common/lpc.c:276 src/common/lpc.c:437 src/common/lpq.c:529
 +msgid ""
 +msgstr ""
-+"Project-Id-Version: LPRng 3.8.19\n"
-+"POT-Creation-Date: 2003-02-25 20:08+0100\n"
-+"PO-Revision-Date: 2002-12-27 19:37+0100\n"
-+"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
++"Project-Id-Version: LPRng 3.8.22\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2003-11-13 21:42+0100\n"
++"PO-Revision-Date: 2003-11-13 21:50+0100\n"
++"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 +"Language-Team: Polish <pl@li.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -29,7 +30,7 @@
 +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 +"|| n%100>=20) ? 1 : 2);\n"
 +
-+#: src/common/accounting.c:137
++#: src/common/accounting.c:134
 +#, c-format
 +msgid "connection to accounting server '%s' failed '%s'"
 +msgstr "po³±czenie z serwerem rozliczeñ '%s' nie powiod³o siê: '%s'"
@@ -766,226 +767,226 @@
 +msgid "debugging override off"
 +msgstr "wymuszenie ¶ledzenia wy³±czone"
 +
-+#: src/common/lpd_jobs.c:425
++#: src/common/lpd_jobs.c:426
 +#, c-format
 +msgid "Do_queue_jobs: cannot open lockfile '%s'"
 +msgstr "Do_queue_jobs: nie mo¿na otworzyæ pliku blokuj±cego '%s'"
 +
-+#: src/common/lpd_jobs.c:733 src/common/lpd_jobs.c:2246
++#: src/common/lpd_jobs.c:734 src/common/lpd_jobs.c:2246
 +#, c-format
 +msgid "cannot update hold file for '%s'"
 +msgstr "nie mo¿na uaktualniæ pliku wstrzymania dla '%s'"
 +
-+#: src/common/lpd_jobs.c:736
++#: src/common/lpd_jobs.c:737
 +#, c-format
 +msgid "Do_queue_jobs: cannot update hold file for '%s'"
 +msgstr "Do_queue_jobs: nie mo¿na uaktualniæ pliku wstrzymania dla '%s'"
 +
-+#: src/common/lpd_jobs.c:740
++#: src/common/lpd_jobs.c:741
 +#, c-format
 +msgid "removing job '%s' - no permissions"
 +msgstr "usuwanie zadania '%s' - brak uprawnieñ"
 +
-+#: src/common/lpd_jobs.c:999
++#: src/common/lpd_jobs.c:1000
 +#, c-format
 +msgid "Do_queue_jobs: LOGIC ERROR - no identifer '%s'"
 +msgstr "Do_queue_jobs: B£¡D LOGIKI - brak identyfikatora '%s'"
 +
-+#: src/common/lpd_jobs.c:1023
++#: src/common/lpd_jobs.c:1024
 +#, c-format
 +msgid "cannot update hold file '%s'"
 +msgstr "nie mo¿na uaktualniæ pliku wstrzymania '%s'"
 +
-+#: src/common/lpd_jobs.c:1025
++#: src/common/lpd_jobs.c:1026
 +#, c-format
 +msgid "Do_queue_jobs: cannot update hold file '%s'"
 +msgstr "Do_queue_jobs: nie mo¿na uaktualniæ pliku wstrzymania '%s'"
 +
-+#: src/common/lpd_jobs.c:1154
++#: src/common/lpd_jobs.c:1155
 +msgid "sleeping, waiting for processes to exit"
 +msgstr "oczekiwanie na zakoñczenie procesów"
 +
-+#: src/common/lpd_jobs.c:1326
++#: src/common/lpd_jobs.c:1327
 +#, c-format
 +msgid "Remote_job: %d datafiles and only allowed %d"
 +msgstr "Remote_job: %d plików danych, a dozwolonych tylko %d"
 +
-+#: src/common/lpd_jobs.c:1360
++#: src/common/lpd_jobs.c:1361
 +#, c-format
 +msgid "link failure while sending job '%s'"
 +msgstr "b³±d po³±czenia podczas wysy³ania zadania '%s'"
 +
-+#: src/common/lpd_jobs.c:1366
++#: src/common/lpd_jobs.c:1367
 +#, c-format
 +msgid "no permission to spool job '%s'"
 +msgstr "brak uprawnieñ do skolejkowania zadania '%s'"
 +
-+#: src/common/lpd_jobs.c:1372
++#: src/common/lpd_jobs.c:1373
 +#, c-format
 +msgid "failed to send job '%s'"
 +msgstr "wys³anie zadania '%s' nie powiod³o siê"
 +
-+#: src/common/lpd_jobs.c:1538
++#: src/common/lpd_jobs.c:1539
 +msgid "Fork_subserver: fork failed"
 +msgstr "Fork_subserver: fork nie powiod³o siê"
 +
-+#: src/common/lpd_jobs.c:1604
++#: src/common/lpd_jobs.c:1605
 +#, c-format
 +msgid "subserver pid %d exit status '%s'"
 +msgstr "podserwer pid %d zakoñczony ze statusem '%s'"
 +
-+#: src/common/lpd_jobs.c:1608
++#: src/common/lpd_jobs.c:1609
 +#, c-format
 +msgid "subserver pid %d died with signal '%s'"
 +msgstr "podserwer pid %d umar³ od sygna³u '%s'"
 +
-+#: src/common/lpd_jobs.c:1651
++#: src/common/lpd_jobs.c:1652
 +msgid "Wait_for_subserver: Mergesort failed"
 +msgstr "Wait_for_subserver: Mergesort nie powiod³o siê"
 +
-+#: src/common/lpd_jobs.c:1680
++#: src/common/lpd_jobs.c:1681
 +msgid "succ"
 +msgstr "succ"
 +
-+#: src/common/lpd_jobs.c:1681
++#: src/common/lpd_jobs.c:1682
 +msgid "jsucc"
 +msgstr "jsucc"
 +
-+#: src/common/lpd_jobs.c:1682
++#: src/common/lpd_jobs.c:1683
 +msgid "success"
 +msgstr "success"
 +
-+#: src/common/lpd_jobs.c:1683
++#: src/common/lpd_jobs.c:1684
 +msgid "jsuccess"
 +msgstr "jsuccess"
 +
-+#: src/common/lpd_jobs.c:1684
++#: src/common/lpd_jobs.c:1685
 +msgid "abort"
 +msgstr "abort"
 +
-+#: src/common/lpd_jobs.c:1685
++#: src/common/lpd_jobs.c:1686
 +msgid "jabort"
 +msgstr "jabort"
 +
-+#: src/common/lpd_jobs.c:1686
++#: src/common/lpd_jobs.c:1687
 +msgid "hold"
 +msgstr "hold"
 +
-+#: src/common/lpd_jobs.c:1687
++#: src/common/lpd_jobs.c:1688
 +msgid "jhold"
 +msgstr "jhold"
 +
-+#: src/common/lpd_jobs.c:1688
++#: src/common/lpd_jobs.c:1689
 +msgid "remove"
 +msgstr "remove"
 +
-+#: src/common/lpd_jobs.c:1689
++#: src/common/lpd_jobs.c:1690
 +msgid "jremove"
 +msgstr "jremove"
 +
-+#: src/common/lpd_jobs.c:1863
++#: src/common/lpd_jobs.c:1864
 +#, c-format
 +msgid "Update_status: no identifier for '%s'"
 +msgstr "Update_status: brak identyfikatora dla '%s'"
 +
-+#: src/common/lpd_jobs.c:1896 src/common/lpd_jobs.c:2003
-+#: src/common/lpd_jobs.c:2045 src/common/lpd_jobs.c:2089
++#: src/common/lpd_jobs.c:1897 src/common/lpd_jobs.c:2004
++#: src/common/lpd_jobs.c:2046 src/common/lpd_jobs.c:2090
 +#, c-format
 +msgid "job '%s' saved"
 +msgstr "zadanie '%s' zachowane"
 +
-+#: src/common/lpd_jobs.c:1901 src/common/lpd_jobs.c:2009
-+#: src/common/lpd_jobs.c:2051 src/common/lpd_jobs.c:2095
++#: src/common/lpd_jobs.c:1902 src/common/lpd_jobs.c:2010
++#: src/common/lpd_jobs.c:2052 src/common/lpd_jobs.c:2096
 +#, c-format
 +msgid "could not remove job '%s'"
 +msgstr "nie mo¿na usun±æ zadania '%s'"
 +
-+#: src/common/lpd_jobs.c:1903 src/common/lpd_jobs.c:2011
-+#: src/common/lpd_jobs.c:2053 src/common/lpd_jobs.c:2097
++#: src/common/lpd_jobs.c:1904 src/common/lpd_jobs.c:2012
++#: src/common/lpd_jobs.c:2054 src/common/lpd_jobs.c:2098
 +#, c-format
 +msgid "job '%s' removed"
 +msgstr "zadanie '%s' usuniête"
 +
-+#: src/common/lpd_jobs.c:1933
++#: src/common/lpd_jobs.c:1934
 +#, c-format
 +msgid "job '%s', attempt %d, allowed %d"
 +msgstr "zadanie '%s', próba %d, dozwolonych %d"
 +
-+#: src/common/lpd_jobs.c:1937
++#: src/common/lpd_jobs.c:1938
 +msgid "treating as successful"
 +msgstr "traktowane jako pomy¶lne"
 +
-+#: src/common/lpd_jobs.c:1938
++#: src/common/lpd_jobs.c:1939
 +msgid "retrying job"
 +msgstr "ponawianie próby"
 +
-+#: src/common/lpd_jobs.c:1939
++#: src/common/lpd_jobs.c:1940
 +msgid "no retry"
 +msgstr "bez ponawiania"
 +
-+#: src/common/lpd_jobs.c:1940
++#: src/common/lpd_jobs.c:1941
 +msgid "aborting server"
 +msgstr "przerwanie zadania"
 +
-+#: src/common/lpd_jobs.c:1941
++#: src/common/lpd_jobs.c:1942
 +msgid "removing job - status JREMOVE"
 +msgstr "usuwanie zadania - status JREMOVE"
 +
-+#: src/common/lpd_jobs.c:1942
++#: src/common/lpd_jobs.c:1943
 +msgid "holding job"
 +msgstr "wstrzymywanie zadania"
 +
-+#: src/common/lpd_jobs.c:1945
++#: src/common/lpd_jobs.c:1946
 +#, c-format
 +msgid "unexpected status 0x%x"
 +msgstr "nieoczekiwany status 0x%x"
 +
-+#: src/common/lpd_jobs.c:1950
++#: src/common/lpd_jobs.c:1951
 +#, c-format
 +msgid "job '%s', %s"
 +msgstr "zadanie '%s', %s"
 +
-+#: src/common/lpd_jobs.c:1954
++#: src/common/lpd_jobs.c:1955
 +#, c-format
 +msgid "job '%s' attempt %d, trying %d times"
 +msgstr "zadanie '%s' próba %d, próbowanie %d razy"
 +
-+#: src/common/lpd_jobs.c:1957
++#: src/common/lpd_jobs.c:1958
 +#, c-format
 +msgid "job '%s' attempt %d, trying indefinitely"
 +msgstr "zadanie '%s' próba %d, próbowanie bez koñca"
 +
-+#: src/common/lpd_jobs.c:1976
++#: src/common/lpd_jobs.c:1977
 +msgid "failed, no retry"
 +msgstr "nie powiod³o siê, bez ponownych prób"
 +
-+#: src/common/lpd_jobs.c:2007
++#: src/common/lpd_jobs.c:2008
 +#, c-format
 +msgid "removing job '%s' - JFAILNORETRY"
 +msgstr "usuwanie zadania '%s' - JFAILNORETRY"
 +
-+#: src/common/lpd_jobs.c:2019
++#: src/common/lpd_jobs.c:2020
 +msgid "aborting operations"
 +msgstr "przerywanie operacji"
 +
-+#: src/common/lpd_jobs.c:2049
++#: src/common/lpd_jobs.c:2050
 +#, c-format
 +msgid "removing job '%s' - JABORT"
 +msgstr "usuwanie zadania '%s' - JABORT"
 +
-+#: src/common/lpd_jobs.c:2058
++#: src/common/lpd_jobs.c:2059
 +msgid "stopping printing on filter JABORT exit code"
 +msgstr "zatrzymywanie drukowania po kodzie wyj¶cia filtra JABORT"
 +
-+#: src/common/lpd_jobs.c:2068
++#: src/common/lpd_jobs.c:2069
 +msgid "removing destination due to errors"
 +msgstr "usuwanie celu z powodu b³êdów"
 +
-+#: src/common/lpd_jobs.c:2079
++#: src/common/lpd_jobs.c:2080
 +msgid "too many errors"
 +msgstr "za du¿o b³êdów"
 +
-+#: src/common/lpd_jobs.c:2093
++#: src/common/lpd_jobs.c:2094
 +#, c-format
 +msgid "removing job '%s' - JREMOVE"
 +msgstr "usuwanie zadania '%s' - JREMOVE"
@@ -1005,16 +1006,16 @@
 +msgid "Service_worker: no identifier for '%s'"
 +msgstr "Service_worker: brak identyfikatora dla '%s'"
 +
-+#: src/common/lpd_jobs.c:2922
++#: src/common/lpd_jobs.c:2916
 +#, c-format
 +msgid "job '%s' removed- status expired"
 +msgstr "zadanie '%s' usuniête - status wygas³"
 +
-+#: src/common/lpd_rcvjob.c:136 src/common/lpd_rcvjob.c:489
++#: src/common/lpd_rcvjob.c:136 src/common/lpd_rcvjob.c:491
 +msgid "bad command line"
 +msgstr "b³êdna linia polecenia"
 +
-+#: src/common/lpd_rcvjob.c:140 src/common/lpd_rcvjob.c:493
++#: src/common/lpd_rcvjob.c:140 src/common/lpd_rcvjob.c:495
 +msgid "bad printer name"
 +msgstr "b³êdna nazwa drukarki"
 +
@@ -1023,7 +1024,7 @@
 +msgid "%s: cannot set up print queue"
 +msgstr "%s: nie mo¿na ustawiæ kolejki wydruków"
 +
-+#: src/common/lpd_rcvjob.c:184 src/common/lpd_rcvjob.c:536
++#: src/common/lpd_rcvjob.c:184 src/common/lpd_rcvjob.c:538
 +#: src/common/lpd_secure.c:189
 +#, c-format
 +msgid "%s: spooling disabled"
@@ -1044,88 +1045,88 @@
 +msgid "Receive_job: cannot lock lockfile '%s'"
 +msgstr "Receive_job: nie mo¿na zablokowaæ pliku blokuj±cego '%s'"
 +
-+#: src/common/lpd_rcvjob.c:268
++#: src/common/lpd_rcvjob.c:270
 +#, c-format
 +msgid "%s: Receive_job - bad control line '%s', len %0.0f, name '%s'"
 +msgstr ""
 +"%s: Receive_job - b³êdna linia kontrolna '%s', d³ugo¶æ %0.0f, nazwa '%s'"
 +
-+#: src/common/lpd_rcvjob.c:284
++#: src/common/lpd_rcvjob.c:286
 +#, c-format
 +msgid "%s: job size %0.3fK is larger than %d K"
 +msgstr "%s: rozmiar zadania %0.3fK jest wiêkszy ni¿ %d K"
 +
-+#: src/common/lpd_rcvjob.c:290 src/common/lpd_rcvjob.c:554
++#: src/common/lpd_rcvjob.c:292 src/common/lpd_rcvjob.c:556
 +#: src/common/lpd_secure.c:203
 +#, c-format
 +msgid "%s: insufficient file space"
 +msgstr "%s: za ma³o miejsca na plik"
 +
-+#: src/common/lpd_rcvjob.c:303 src/common/lpd_rcvjob.c:606
++#: src/common/lpd_rcvjob.c:305 src/common/lpd_rcvjob.c:608
 +#, c-format
 +msgid "%s: sending ACK 0 for '%s' failed"
 +msgstr "%s: wysy³anie ACK 0 dla '%s' nie powiod³o siê"
 +
-+#: src/common/lpd_rcvjob.c:331 src/common/lpd_rcvjob.c:579
++#: src/common/lpd_rcvjob.c:333 src/common/lpd_rcvjob.c:581
 +#, c-format
 +msgid "%s: transfer of '%s' from '%s' failed"
 +msgstr "%s: przesy³anie '%s' z '%s' nie powiod³o siê"
 +
-+#: src/common/lpd_rcvjob.c:429
++#: src/common/lpd_rcvjob.c:431
 +#, c-format
 +msgid "Receive_jobs: write to fd '%d' failed"
 +msgstr "Receive_jobs: zapis do deskryptora '%d' nie powiód³ siê"
 +
-+#: src/common/lpd_rcvjob.c:500
++#: src/common/lpd_rcvjob.c:502
 +#, c-format
 +msgid "%s: cannot set up printer"
 +msgstr "%s: nie mo¿na ustawiæ drukarki"
 +
-+#: src/common/lpd_rcvjob.c:548
++#: src/common/lpd_rcvjob.c:550
 +#, c-format
 +msgid "%s: job size %0.3f is larger than %dK"
 +msgstr "%s: rozmiar zadania %0.3f jest wiêkszy ni¿ %dK"
 +
-+#: src/common/lpd_rcvjob.c:568
++#: src/common/lpd_rcvjob.c:570
 +#, c-format
 +msgid "%s: Receive_block_job: sending ACK 0 failed"
 +msgstr "%s: Receive_block_job: wysy³anie ACK 0 nie powiod³o siê"
 +
-+#: src/common/lpd_rcvjob.c:589
++#: src/common/lpd_rcvjob.c:591
 +#, c-format
 +msgid "Receive_block_job: lseek failed '%s'"
 +msgstr "Receive_block_job: lseek nie powiod³o siê: '%s'"
 +
-+#: src/common/lpd_rcvjob.c:636
++#: src/common/lpd_rcvjob.c:638
 +#, c-format
 +msgid "Receive_block_jobs: write to fd '%d' failed"
 +msgstr "Receive_block_jobs: zapis do deskryptora '%d' nie powiód³ siê"
 +
-+#: src/common/lpd_rcvjob.c:698 src/common/lpd_rcvjob.c:742
++#: src/common/lpd_rcvjob.c:700 src/common/lpd_rcvjob.c:744
 +#, c-format
 +msgid "Scan_block_file: lseek failed '%s'"
 +msgstr "Scan_block_file: lseek nie powiod³o siê: '%s'"
 +
-+#: src/common/lpd_rcvjob.c:713
++#: src/common/lpd_rcvjob.c:715
 +#, c-format
 +msgid "bad length information '%s'"
 +msgstr "b³êdna informacja o d³ugo¶ci '%s'"
 +
-+#: src/common/lpd_rcvjob.c:730
++#: src/common/lpd_rcvjob.c:732
 +#, c-format
 +msgid "Scan_block_file: read failed '%s'"
 +msgstr "Scan_block_file: odczyt nie powiód³ siê: '%s'"
 +
-+#: src/common/lpd_rcvjob.c:735
++#: src/common/lpd_rcvjob.c:737
 +msgid "Scan_block_file: read unexecpted EOF"
 +msgstr "Scan_block_file: nieoczekiwany EOF przy odczycie"
 +
-+#: src/common/lpd_rcvjob.c:870
++#: src/common/lpd_rcvjob.c:872
 +#, c-format
 +msgid "%s: no permission to print"
 +msgstr "%s: brak uprawnieñ do drukowania"
 +
-+#: src/common/lpd_rcvjob.c:1302
++#: src/common/lpd_rcvjob.c:1306
 +#, c-format
 +msgid "Get_route: no identifier for '%s'"
 +msgstr "Get_route: brak identyfikatora dla '%s'"
@@ -1208,6 +1209,14 @@
 +msgid "%s: no permission to show status"
 +msgstr "%s: brak uprawnieñ do pokazania stanu"
 +
++#: src/common/lpd_status.c:470
++msgid "Server Printer"
++msgstr "Serwer drukarek:"
++
++#: src/common/lpd_status.c:470
++msgid "Printer"
++msgstr "Drukarka"
++
 +#: src/common/lpd_status.c:477
 +#, c-format
 +msgid " (originally %s)"
@@ -1540,6 +1549,10 @@
 +msgid "  -V           - print version information\n"
 +msgstr "  -V           - wypisanie informacji o wersji\n"
 +
++#: src/common/lpq.c:557
++msgid "  -v           - print in key: value format\n"
++msgstr "  -v           - wypisanie w postaci klucz: warto¶æ\n"
++
 +#: src/common/lpr.c:161
 +msgid "nothing to print"
 +msgstr "nie ma niczego do wydrukowania"

diff --git a/LPRng-types.patch b/LPRng-types.patch
index 756a43f6c6dd2a59d6b8182866d60e3c9ed52975..5f3a26766c1a4239956a102ee0c3b05073ba8f07 100644 (file)
--- a/LPRng-types.patch
+++ b/LPRng-types.patch
@@ -1,37 +1,6 @@
---- LPRng-3.8.21/src/common/vars.c.orig        Tue Aug  5 16:02:18 2003
-+++ LPRng-3.8.21/src/common/vars.c     Tue Aug  5 15:48:18 2003
-@@ -175,7 +175,7 @@
-    /* connection timeout for remote printers */
- { "connect_timeout", 0, INTEGER_K, &Connect_timeout_DYN,0,0,"=10"},
-    /* control file line order */
--{ "control_file_line_order", 0, STRING_K, &Control_filter_DYN,0,0,0},
-+{ "control_file_line_order", 0, STRING_K, &Control_file_line_order_DYN,0,0,0},
-    /* control file filter */
- { "control_filter", 0, STRING_K, &Control_filter_DYN,0,0,0},
-    /* create files in spool directory */
-@@ -211,9 +211,9 @@
-    /*  string to send for a form feed */
- { "ff", 0,  STRING_K,  &Form_feed_DYN,0,0,"=\\f"},
-    /*  string to send for a form feed */
--{ "ff_separator", 0,  STRING_K,  &FF_separator_DYN,0,0,0},
-+{ "ff_separator", 0,  FLAG_K,  &FF_separator_DYN,0,0,0},
-    /* enforce FIFO (first in, first out) order */
--{ "fifo", 0, STRING_K, &Fifo_DYN,0,0,0},
-+{ "fifo", 0, FLAG_K, &Fifo_DYN,0,0,0},
-    /* FIFO lock file */
- { "fifo_lock_file", 0, STRING_K, &Fifo_lock_file_DYN,0,0,"=fifo.lock"},
-    /* default filter */
---- LPRng-3.8.21/src/include/lp.h.orig Wed Apr 16 01:37:43 2003
-+++ LPRng-3.8.21/src/include/lp.h      Tue Aug  5 16:01:33 2003
-@@ -231,7 +231,6 @@
- EXTERN char *ShortHost_FQDN;          /* Short hostname for logging */
- EXTERN char *FQDNHost_FQDN;           /* FQDN hostname */
- EXTERN char* FQDNRemote_FQDN;    /* FQDN of Remote host */
--EXTERN char* FQDNRemote_FQDN;    /* FQDN of Remote host */
- EXTERN char* ShortRemote_FQDN;   /* Short form of Remote host */
- /* EXTERN char* Auth_client_id_DYN;   / * client sent/received authentication info */
- 
-@@ -267,7 +266,7 @@
+--- LPRng-3.8.22/src/include/lp.h.orig 2003-09-05 22:07:21.000000000 +0200
++++ LPRng-3.8.22/src/include/lp.h      2003-11-13 08:03:56.471808920 +0100
+@@ -267,7 +267,7 @@
  EXTERN int Check_for_protocol_violations_DYN; /* check for RFC1179 protocol violations */
  EXTERN char* Chooser_DYN;     /* choose the destination for a load balance queue */
  EXTERN int Chooser_interval_DYN;      /* interval between tests for load balance destination */
@@ -40,7 +9,7 @@
  EXTERN int Class_in_status_DYN;       /* Show class in status information */
  EXTERN char* Comment_tag_DYN; /* comment identifying printer (LPQ) */
  EXTERN char* Config_file_DYN;
-@@ -392,7 +391,7 @@
+@@ -392,7 +392,7 @@
  EXTERN char* Prefix_Z_DYN; /* prefix -Z options on outgoing or filter*/
  EXTERN char* Prefix_option_to_option_DYN; /* prefix option to option, ie, "z,o" */
  EXTERN char* Printcap_path_DYN;

diff --git a/LPRng.spec b/LPRng.spec
index d583e459d56fa20a4bb7b9ddf7e4431cfe4a35c9..d81ebbe04022b20a1a45d581f290dc69b1edad89 100644 (file)
--- a/LPRng.spec
+++ b/LPRng.spec
@@ -5,12 +5,12 @@ Summary(ru):  
 Summary(uk):   óÐÕÌÅÒ ÄÒÕËÕ LPRng
 Summary(zh_CN):        LPRng--´òÓ¡³ÌÐò
 Name:          LPRng
-Version:       3.8.21
-Release:       2
-License:       GPL
+Version:       3.8.22
+Release:       1
+License:       GPL or Artistic
 Group:         Applications/System
 Source0:       ftp://ftp.lprng.com/pub/LPRng/LPRng/%{name}-%{version}.tgz
-# Source0-md5: 396d0a49a4533ad973176efa9bf054b1
+# Source0-md5: ac7742d87433ea6908517ddb3b8a648a
 Source1:       %{name}.init
 Source2:       %{name}.conf
 Source3:       %{name}.printcap
@@ -18,18 +18,18 @@ Source4:    http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.t
 # Source4-md5: 4771b1c3598677a8201a9e203235dff3
 Patch0:                %{name}-ac_fixes.patch
 Patch1:                %{name}-lpd-perms.patch
-Patch2:                %{name}-no_dupl_DESDIR.patch
-Patch3:                %{name}-ngettext.patch
-Patch4:                %{name}-missing-nls.patch
-Patch5:                %{name}-pl.po.patch
-Patch6:                %{name}-types.patch
-Patch7:                %{name}-gcc33.patch
+#Patch2:               %{name}-no_dupl_DESDIR.patch
+Patch2:                %{name}-ngettext.patch
+Patch3:                %{name}-missing-nls.patch
+Patch4:                %{name}-pl.po.patch
+Patch5:                %{name}-types.patch
+#Patch6:               %{name}-gcc33.patch
 URL:           http://www.astart.com/lprng/LPRng.html
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: libtool
-BuildRequires: ncurses-devel >= 5.0
+BuildRequires: openssl-devel
 PreReq:                rc-scripts >= 0.2.0
 Requires(post):        /sbin/ldconfig
 Requires(post,preun):  /sbin/chkconfig
@@ -162,23 +162,26 @@ Support 
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
-rm -f missing
 %{__gettextize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
-cp -f /usr/share/automake/{config.,missing}* .
-PSHOWALL="-ax"; export PSHOWALL
+cp -f /usr/share/automake/{config.*,missing} .
+#PSHOWALL="-ax"; export PSHOWALL
+# now it wants to use /etc/lpd/lpd.{conf,perms} - stick to old values?
 %configure \
+       OPENSSL=/usr/bin/openssl \
+       PSHOWALL="-ax" \
        --disable-setuid \
+       --enable-shared \
        --with-userid=lp \
        --with-groupid=lp \
        --with-filterdir=%{_libdir}/lpfilters \
        --with-lockfile=%{_var}/spool/lpd/lpd \
+       --with-lpd_conf_path=%{_sysconfdir}/lpd.conf \
+       --with-lpd_perms_path=%{_sysconfdir}/lpd.perms \
        --with-done_jobs=0
 
 %{__make}
@@ -186,7 +189,8 @@ PSHOWALL="-ax"; export PSHOWALL
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d  $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_var}/spool/lpd/lp}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_var}/spool/lpd/lp} \
+       $RPM_BUILD_ROOT%{_sysconfdir}/lpd/ssl.{ca,crl,server}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -204,6 +208,8 @@ install lpd.perms $RPM_BUILD_ROOT%{_sysconfdir}
 
 bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
+mv -f PrintingCookbook/{HTML,PrintingCookbook}
+
 %find_lang %{name}
 
 %clean
@@ -230,10 +236,16 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc CHANGES README HOWTO/LPRng-HOWTO.html
+%doc CHANGES CONTRIBUTORS COPYRIGHT README README.SSL* TODO
+%doc DOCS/LPRng-Reference-Multipart PrintingCookbook/PrintingCookbook
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lpd.conf
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/lpd.perms
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/printcap
+%dir %{_sysconfdir}/lpd
+# what perms?
+%attr(750,root,lp) %dir %{_sysconfdir}/lpd/ssl.ca
+%attr(750,root,lp) %dir %{_sysconfdir}/lpd/ssl.crl
+%attr(750,root,lp) %dir %{_sysconfdir}/lpd/ssl.server
 %attr(754,root,root) /etc/rc.d/init.d/lpd
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*