[SCM] dpkg's main repository branch, lenny, updated. 1.14.24-4-gf16b39c
The following commit has been merged in the lenny branch: commit 4d8c298a7f7dd8be21ad01f90ef7de60657ca18a Author: Piarres Beobide p...@beobide.net Date: Mon Jan 5 00:28:44 2009 +0200 Update Basque translations Closes: #506092, #509851, #509852 diff --git a/debian/changelog b/debian/changelog index d6a0cf3..e170619 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ dpkg (1.14.25) UNRELEASED; urgency=low - * + [ Updated dpkg translations ] + * Basque (Piarres Beobide). Closes: #506092, #509851 + + [ Updated dselect translations ] + * Basque (Piarres Beobide). Closes: #509852 -- Guillem Jover guil...@debian.org Mon, 29 Dec 2008 05:52:37 +0100 diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog index 84bf5ae..00e3769 100644 --- a/dselect/po/ChangeLog +++ b/dselect/po/ChangeLog @@ -1,3 +1,7 @@ +2009-01-05 Piarres Beobide p...@beobide.net + + * eu.po: Updated to 287t. + 2008-12-28 Marce Villarino mvillar...@gmail.com * gl.po: Updated to 288t. diff --git a/dselect/po/eu.po b/dselect/po/eu.po index b8e3835..02c1593 100644 --- a/dselect/po/eu.po +++ b/dselect/po/eu.po @@ -5,12 +5,12 @@ # Piarres Beobide p...@beobide.net, 2004, 2005, 2006, 2008. msgid msgstr -Project-Id-Version: eu\n +Project-Id-Version: dselect\n Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n POT-Creation-Date: 2008-03-30 10:09+0300\n -PO-Revision-Date: 2008-01-24 13:36+0100\n +PO-Revision-Date: 2009-01-05 00:18+0200\n Last-Translator: Piarres Beobide p...@beobide.net\n -Language-Team: Euskara librez...@librezale.org\n +Language-Team: Euskara debian-l10n-bas...@lists.debian.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -289,9 +289,8 @@ msgid Revert to directly requested state for all packages msgstr Leheneratu pakete guztiak zuzenean eskatutako egoerara #: dselect/bindings.cc:161 -#, fuzzy msgid Revert to currently installed state for all packages -msgstr Leheneratu pakete guztiak zuzenean eskatutako egoerara +msgstr Leheneratu pakete guztiak unean instalaturik dagoen egoerara #: dselect/bindings.cc:164 msgid Select currently-highlighted access method @@ -1339,11 +1338,11 @@ msgstr huts egin du konfiguratzean #: dselect/pkgdisplay.cc:57 msgid awaiting trigger processing -msgstr +msgstr abiarazle prozesatzea itxoiten #: dselect/pkgdisplay.cc:58 msgid triggered -msgstr +msgstr abiarazia #: dselect/pkgdisplay.cc:59 msgid installed @@ -1402,9 +1401,8 @@ msgid pre-depends on msgstr honen aurremendekoa da: #: dselect/pkgdisplay.cc:77 -#, fuzzy msgid breaks -msgstr honekin hondatzen da: +msgstr hau hondatzen du: #: dselect/pkgdisplay.cc:78 msgid conflicts with diff --git a/po/ChangeLog b/po/ChangeLog index 2973738..904947d 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2009-01-05 Piarres Beobide p...@beobide.net + + * eu.po: Updated to 986t. + 2008-12-29 Guillem Jover guil...@debian.org * dpkg.pot: Regenerated. diff --git a/po/eu.po b/po/eu.po index fee7256..2478158 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,4 +1,4 @@ -# translation of dpkg_po_eu.po to Euskara +# translation of eu.po to Euskara # translation of dpkg-trunk-eu.po to # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # @@ -6,10 +6,10 @@ # Piarres Beobide p...@beobide.net, 2004, 2005, 2006, 2007, 2008. msgid msgstr -Project-Id-Version: dpkg_po_eu\n +Project-Id-Version: dpkg\n Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n POT-Creation-Date: 2008-12-29 05:28+0100\n -PO-Revision-Date: 2008-08-27 10:10+0200\n +PO-Revision-Date: 2009-01-05 00:15+0200\n Last-Translator: Piarres Beobide p...@beobide.net\n Language-Team: Euskara debian-l10n-bas...@lists.debian.org\n MIME-Version: 1.0\n @@ -270,6 +270,8 @@ msgid %s: unrecoverable fatal error, aborting:\n %s\n msgstr +%s: errore konponezina, uzten:\n + %s\n #: lib/ehandle.c:101 msgid out of memory pushing error handler: -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, lenny, updated. 1.14.24-4-gf16b39c
The following commit has been merged in the lenny branch:
commit f16b39cc949ef24535858112b84e0e48c129f565
Author: Miguel Figueiredo el...@debianpt.org
Date: Mon Jan 5 00:36:44 2009 +0200
Update Portuguese dselect translation
Closes: #509904
diff --git a/debian/changelog b/debian/changelog
index 83cee1a..4006868 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dpkg (1.14.25) UNRELEASED; urgency=low
[ Updated dselect translations ]
* Basque (Piarres Beobide). Closes: #509852
+ * Portuguese (Miguel Figueiredo). Closes: #509904
-- Guillem Jover guil...@debian.org Mon, 29 Dec 2008 05:52:37 +0100
diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog
index 00e3769..a2212e1 100644
--- a/dselect/po/ChangeLog
+++ b/dselect/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-05 Miguel Figueiredo el...@debianpt.org
+
+ * pt.po: Updated to 288t.
+
2009-01-05 Piarres Beobide p...@beobide.net
* eu.po: Updated to 287t.
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 5aad92a..f1ecd15 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -1,13 +1,13 @@
# PT translation for dpkg.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Miguel Figueiredo el...@debianpt.org, 2004-2007.
+# Miguel Figueiredo el...@debianpt.org, 2004-2008.
#
msgid
msgstr
Project-Id-Version: dselect\n
Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n
POT-Creation-Date: 2008-03-30 10:09+0300\n
-PO-Revision-Date: 2007-05-25 21:24+0100\n
+PO-Revision-Date: 2008-12-27 16:05+\n
Last-Translator: Miguel Figueiredo el...@debianpt.org\n
Language-Team: Portuguese tra...@debianpt.org\n
MIME-Version: 1.0\n
@@ -285,9 +285,8 @@ msgid Revert to directly requested state for all packages
msgstr Voltar ao estado directamente requisitado para todos os pacotes
#: dselect/bindings.cc:161
-#, fuzzy
msgid Revert to currently installed state for all packages
-msgstr Voltar ao estado directamente requisitado para todos os pacotes
+msgstr Voltar ao estado actualmente instalado para todos os pacotes
#: dselect/bindings.cc:164
msgid Select currently-highlighted access method
@@ -534,7 +533,6 @@ msgid Display, part 1: package listing and status chars
msgstr Visualização, parte 1: lista de pacotes e caracteres de status
#: dselect/helpmsgs.cc:121
-#, fuzzy
msgid
The top half of the screen shows a list of packages. For each package you
see\n
@@ -566,36 +564,39 @@ msgid
available version numbers (shift-V to display/hide) and summary
description.\n
msgstr
-A metade de cima da tela mostra uma lista de pacotes. Para cada pacote você
-vê\n
+A metade superior do ecraã mostra uma lista de pacotes. Para cada pacote vê\n
quatro colunas para seu estado actual no sistema e marcação. No modo
resumido\n
-(use `v' para ligar exibição detalhada), esses são caracteres simples, da
-esq.\n
-para a direita:\n
+(use `v' para comutar a exibição detalhada) esses são caracteres simples,
+da\n
+esquerda para a direita:\n
\n
- Marca de Erro: Espaço - sem erros (pacote pode estar estragado - veja
-abaixo)\n
+ Marca de Erro: Espaço - sem erros (mas o pacote pode estar no estado
+estragado\n
+(broken) - veja abaixo)\n
`R'- erro sério durante a instalação, requer
reinstalação;\n
- Estado de Instalação: Espaço - não instalado;\n
- `*' - instalado;\n
- `-' - não instalado mas ficheiros de config.
-existem;\n
- pacotes { `U' - descompactado mas ainda não configurado;\n
-nesses estados { `C' - semi-configurado (um erro aconteceu);\n
- estão quebrados { `I' - semi-instalado (um erro aconteceu).\n
- Marca antiga: o que foi req. para esse pacote antes de apresentar essa
+ Estado Instalado: \tEspaço\t - não instalado;\n
+ `*'\t - instalado;\n
+`-'\t - não instalado mas os ficheiros de\n
+\t\t\t\tconfiguração mantêm-se;\n
+ os pacotes\t\t{ `U' - descompactado mas ainda não configurado;\n
+ nestes estados\t{ `C' - semi-configurado (ocorreu um erro);\n
+ não estão bem \t{ `I'\t - semi-instalado (ocorreu um erro).\n
+ instalados\t\t{ `W',`t' - são esperados triggers, responta pendente.\n
+ Marca antiga: o que foi pedido para este pacote antes de apresentar esta
lista;\n
- Marca: o que é requesitado para este pacote:\n
+ Marca: o que é pedido para este pacote:\n
`*': marcado para instalação ou actualização;\n
`-': marcado para remoção, mas os arquivos de configuração ficarão;\n
- `=': em manutenção: pacote não será processado;\n
+ `=': manter: o pacote não será processado;\n
`_': marcado para purgar por completo - remover até a configuração;\n
- `n': pacote é novo e ainda deve ser marcado para instalação/remoção/etc.\n
+ `n': o pacote é novo e ainda e ainda não foi marcado para instalação/
+remoção/c.\n
\n
-Também são exibidas cada Prioridade, Secção, nome, núm. de versão inst. e\n
-disponíveis de
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch:
commit 006fc961abf17f962fb1b1299b277050483f676f
Author: Guillem Jover guil...@debian.org
Date: Sun Jan 4 17:17:49 2009 +0200
libdpkg: Move printforhelp declaration to myopt.h
diff --git a/ChangeLog b/ChangeLog
index a49c2f2..f43df77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-01-04 Guillem Jover guil...@debian.org
+ * lib/dpkg.h (printforhelp): Move declaration to ...
+ * lib/myopt.h: ... here.
+
+2009-01-04 Guillem Jover guil...@debian.org
+
* lib/dpkg-db.h (trig_note_pend_core, trig_note_pend): Make trig
argument const.
* lib/triglib.c (trig_record_activation): Likewise.
diff --git a/lib/dpkg.h b/lib/dpkg.h
index 61508ff..1db4e1f 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -145,7 +145,6 @@ DPKG_BEGIN_DECLS
#define TARBLKSZ 512
extern const char thisname[]; /* defined separately in each program */
-extern const char printforhelp[];
/*** from startup.c ***/
diff --git a/lib/myopt.h b/lib/myopt.h
index 9c3dfee..6bd363e 100644
--- a/lib/myopt.h
+++ b/lib/myopt.h
@@ -40,6 +40,8 @@ struct cmdinfo {
voidfnp farg;
};
+extern const char printforhelp[];
+
void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
#define MAX_CONFIG_LINE 1024
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch:
commit 0268f49c4a9c2e110814ebda379f0fbe84ecb8ed
Author: Guillem Jover guil...@debian.org
Date: Sun Jan 4 16:38:13 2009 +0200
Remove unused macros and prototypes
diff --git a/ChangeLog b/ChangeLog
index 382eef7..426467f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-01-04 Guillem Jover guil...@debian.org
+ * lib/dpkg.h (SHELL, SHELLENVIR): Remove unused macros.
+ * src/main.h (check_libver): Remove unused prototype.
+
+2009-01-04 Guillem Jover guil...@debian.org
+
* dselect/main.cc (findintable, dme, refreshmenu): Make static.
* dselect/method.cc (sthfailed): Likewise.
* dselect/pkgtop.cc (pkgprioritystring): Likewise.
diff --git a/lib/dpkg.h b/lib/dpkg.h
index 77dc666..61508ff 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -138,11 +138,8 @@ DPKG_BEGIN_DECLS
#define LZMA lzma
#define RM rm
#define FIND find
-#define SHELL sh
#define DIFF diff
-#define SHELLENVIR SHELL
-
#define FIND_EXPRSTARTCHARS -(),!
#define TARBLKSZ 512
diff --git a/src/main.h b/src/main.h
index 4109e4f..036696c 100644
--- a/src/main.h
+++ b/src/main.h
@@ -247,7 +247,6 @@ enum debugflags {
};
void debug(int which, const char *fmt, ...) PRINTFFORMAT(2,3);
-void check_libver(void);
void log_action(const char *action, struct pkginfo *pkg);
/* from trigproc.c */
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch:
commit 6c0c8c0508720deefac78597fec0563ff084eb46
Author: Guillem Jover guil...@debian.org
Date: Sun Jan 4 16:54:28 2009 +0200
libdpkg: Use MAX_CONFIG_LINE instead of MAXDIVERTFILENAME in myfileopt
diff --git a/ChangeLog b/ChangeLog
index 426467f..f6f598b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-01-04 Guillem Jover guil...@debian.org
+ * lib/myopt.h (MAX_CONFIG_LINE): New macro.
+ * lib/myopt.c (myfileopt): Use MAX_CONFIG_LINE instead of
+ MAXDIVERTFILENAME.
+
+2009-01-04 Guillem Jover guil...@debian.org
+
* lib/dpkg.h (SHELL, SHELLENVIR): Remove unused macros.
* src/main.h (check_libver): Remove unused prototype.
diff --git a/lib/myopt.c b/lib/myopt.c
index 717094a..0cf1080 100644
--- a/lib/myopt.c
+++ b/lib/myopt.c
@@ -48,7 +48,7 @@ badusage(const char *fmt, ...)
void myfileopt(const char* fn, const struct cmdinfo* cmdinfos) {
FILE* file;
- char linebuf[MAXDIVERTFILENAME];
+ char linebuf[MAX_CONFIG_LINE];
file= fopen(fn, r);
if (!file) {
diff --git a/lib/myopt.h b/lib/myopt.h
index 29f300e..9c3dfee 100644
--- a/lib/myopt.h
+++ b/lib/myopt.h
@@ -42,6 +42,8 @@ struct cmdinfo {
void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
+#define MAX_CONFIG_LINE 1024
+
void myfileopt(const char* fn, const struct cmdinfo* cmdinfos);
void myopt(const char *const **argvp, const struct cmdinfo *cmdinfos);
void loadcfgfile(const char *prog, const struct cmdinfo *cmdinfos);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch:
commit cf0e5f8eeeaad2e4e1353c65e6c2e5685108b506
Author: Guillem Jover guil...@debian.org
Date: Sun Jan 4 23:41:34 2009 +0200
Fix typo in package description ('privides' - 'provides')
Closes: #510755
Reported-by: Pascal De Vuyst pascal.devu...@gmail.com
diff --git a/debian/changelog b/debian/changelog
index e79a9c3..9e6986a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -41,6 +41,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Do not log repeated strings when the write call wrote partial data.
* Change dir to / after chroot when using --instdir.
Thanks to Colin Watson cjwat...@ubuntu.com. Closes: #509578
+ * Fix typo in package description ('privides' - 'provides').
+Thanks to Pascal De Vuyst pascal.devu...@gmail.com. Closes: #510755
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/debian/control b/debian/control
index dd3bcf3..18ca6d3 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Conflicts: sysvinit ( 2.82-1), dpkg-iasearch ( 0.11),
Replaces: manpages-de (= 0.4-3), manpages-pl (= 20051117-1)
Suggests: apt
Description: Debian package management system
- This package privides the low-level infrastructure for handling the
+ This package provides the low-level infrastructure for handling the
installation and removal of Debian software packages.
.
For Debian package development tools, install dpkg-dev.
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch:
commit 5185f2d9c3ef1b2b2362d3340292494afba6cc90
Author: Guillem Jover guil...@debian.org
Date: Mon Jan 5 00:07:37 2009 +0200
s-s-d: Clarify that the signal sent by default is TERM not KILL
Closes: #507568
diff --git a/ChangeLog b/ChangeLog
index be33ceb..44c5122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-05 Guillem Jover guil...@debian.org
+
+ * man/start-stop-daemon.8: Clarify that the signal sent by default
+ is TERM not KILL.
+
2009-01-04 Guillem Jover guil...@debian.org
* utils/start-stop-daemon.c (signal_nr): Initialize with SIGTERM
diff --git a/debian/changelog b/debian/changelog
index abaa999..e521faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Fix typo in package description ('privides' - 'provides').
Thanks to Pascal De Vuyst pascal.devu...@gmail.com. Closes: #510755
* Make dpkg log files user readable. Closes: #480556
+ * Clarify in the start-stop-daemon man page that the signal sent by default
+is TERM not KILL. Closes: #507568
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index c07411d..7e8bbe2 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -24,8 +24,8 @@ will scan the process table looking for any processes which
match the process name, uid, and/or gid (if specified). Any
matching process will prevent
.BR \-\-start
-from starting the daemon. All matching processes will be
-sent the KILL signal if
+from starting the daemon. All matching processes will be sent the TERM
+signal (or the one specified via \fB\-\-signal\fP or \fB\-\-retry\fP) if
.BR \-\-stop
is specified. For daemons which have long-lived children
which need to live through a
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch: commit e80064ff8dad81dd310dedbf41419087998236f2 Author: Guillem Jover guil...@debian.org Date: Sun Jan 4 18:33:16 2009 +0200 libdpkg: Move macros from dpkg.h to more specialized headers diff --git a/ChangeLog b/ChangeLog index f43df77..afa8b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2009-01-04 Guillem Jover guil...@debian.org + * lib/dpkg.h (LOCALLIBDIR): Move macro to ... + * dselect/Makefile.am (INCLUDES): ... here, as a -D argument. + + * lib/dpkg.h (DSELECT): Move macro to ... + * dselect/dselect.h: ... here. + + * lib/dpkg.h (SPLITVERSION, SPLITPARTDEFMAX): Move macros to ... + * dpkg-split/dpkg-split.h: ... here. + + * lib/dpkg.h (ARCHIVEVERSION, BUILDCONTROLDIR, EXTRACTCONTROLDIR) + (BUILDOLDPKGFORMAT, OLDARCHIVEVERSION, OLDDEBDIR, OLDOLDDEBDIR) + (MAXFIELDNAME, INTERPRETER_MAX): Move macros to ... + * dpkg-deb/dpkg-deb.h: ... here. + +2009-01-04 Guillem Jover guil...@debian.org + * lib/dpkg.h (printforhelp): Move declaration to ... * lib/myopt.h: ... here. diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h index 6cad804..79d3f82 100644 --- a/dpkg-deb/dpkg-deb.h +++ b/dpkg-deb/dpkg-deb.h @@ -38,6 +38,21 @@ extern const char *compression; extern const char* showformat; extern enum compress_type compress_type; +#define ARCHIVEVERSION 2.0 + +#define BUILDCONTROLDIRDEBIAN +#define EXTRACTCONTROLDIR BUILDCONTROLDIR + +/* Set BUILDOLDPKGFORMAT to 1 to build old-format archives by default. */ +#ifndef BUILDOLDPKGFORMAT +#define BUILDOLDPKGFORMAT 0 +#endif + +#define OLDARCHIVEVERSION 0.939000 + +#define OLDDEBDIR DEBIAN +#define OLDOLDDEBDIR .DEBIAN + #define DEBMAGIC !arch\ndebian-binary #define ADMINMEMBERcontrol.tar.gz #define ADMINMEMBER_COMPAT control.tar.gz/ @@ -51,5 +66,12 @@ extern enum compress_type compress_type; #define DATAMEMBER_COMPAT_CAT data.tar/ #define MAXFILENAME 2048 +#define MAXFIELDNAME 200 + +#ifdef PATH_MAX +# define INTERPRETER_MAX PATH_MAX +#else +# define INTERPRETER_MAX 1024 +#endif #endif /* DPKG_DEB_H */ diff --git a/dpkg-split/dpkg-split.h b/dpkg-split/dpkg-split.h index aa27c4c..db30caa 100644 --- a/dpkg-split/dpkg-split.h +++ b/dpkg-split/dpkg-split.h @@ -67,7 +67,11 @@ void reassemble(struct partinfo **partlist, const char *outputfile); void mustgetpartinfo(const char *filename, struct partinfo *ri); void addtopartlist(struct partinfo**, struct partinfo*, struct partinfo *refi); +#define SPLITVERSION 2.1 + #define PARTMAGIC !arch\ndebian-split #define HEADERALLOWANCE1024 +#define SPLITPARTDEFMAX(450 * 1024) + #endif /* DPKG_SPLIT_H */ diff --git a/dselect/Makefile.am b/dselect/Makefile.am index 87e9b37..40c0b16 100644 --- a/dselect/Makefile.am +++ b/dselect/Makefile.am @@ -6,6 +6,7 @@ localedir = $(datadir)/locale INCLUDES = \ -DLOCALEDIR=\$(localedir)\ \ -DADMINDIR=\$(admindir)\ -DLIBDIR=\$(pkglibdir)\ \ + -DLOCALLIBDIR=\/usr/local/lib/dpkg\ \ -idirafter $(top_srcdir)/libcompat \ -I$(top_srcdir)/lib diff --git a/dselect/dselect.h b/dselect/dselect.h index c8e7006..3faa1fa 100644 --- a/dselect/dselect.h +++ b/dselect/dselect.h @@ -23,6 +23,8 @@ #ifndef DSELECT_H #define DSELECT_H +#define DSELECTdselect + #define TOTAL_LIST_WIDTH 180 #define MAX_DISPLAY_INFO 120 diff --git a/lib/dpkg.h b/lib/dpkg.h index 1db4e1f..f72164b 100644 --- a/lib/dpkg.h +++ b/lib/dpkg.h @@ -40,27 +40,12 @@ DPKG_BEGIN_DECLS #include stddef.h #endif -#ifdef PATH_MAX -# define INTERPRETER_MAX PATH_MAX -#else -# define INTERPRETER_MAX 1024 -#endif - -#define ARCHIVEVERSION 2.0 -#define SPLITVERSION 2.1 -#define OLDARCHIVEVERSION 0.939000 -#define SPLITPARTDEFMAX(450*1024) -#define MAXFIELDNAME200 #define MAXCONFFILENAME 1000 #define MAXDIVERTFILENAME 1024 #define MAXCONTROLFILENAME 100 -#define BUILDCONTROLDIRDEBIAN -#define EXTRACTCONTROLDIR BUILDCONTROLDIR #define DEBEXT .deb #define OLDDBEXT -old #define NEWDBEXT -new -#define OLDOLDDEBDIR .DEBIAN -#define OLDDEBDIR DEBIAN #define REMOVECONFFEXTS~, .bak, %, \ DPKGTEMPEXT, DPKGNEWEXT, DPKGOLDEXT, DPKGDISTEXT @@ -105,8 +90,6 @@ DPKG_BEGIN_DECLS #define MAINTSCRIPTPKGENVVAR DPKG_MAINTSCRIPT_PACKAGE #define MAINTSCRIPTDPKGENVVAR DPKG_RUNNING_VERSION -#define LOCALLIBDIR /usr/local/lib/dpkg - #define NOJOBCTRLSTOPENVDPKG_NO_TSTP #define SHELLENVSHELL #define DEFAULTSHELLsh @@ -128,7 +111,6 @@ DPKG_BEGIN_DECLS #define BACKENDdpkg-deb #define DPKGQUERY dpkg-query #define SPLITTER dpkg-split -#define DSELECTdselect #define DPKG dpkg #define DEBSIGVERIFY
[SCM] dpkg's main repository branch, master, updated. 1.14.23-208-g5185f2d
The following commit has been merged in the master branch: commit 09e696654a8cf58477e148cc2d9eb496cf8a72f4 Author: Guillem Jover guil...@debian.org Date: Sun Jan 4 23:57:58 2009 +0200 s-s-d: Use SIGTERM instead of literal 15 diff --git a/ChangeLog b/ChangeLog index afa8b7d..be33ceb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-01-04 Guillem Jover guil...@debian.org + * utils/start-stop-daemon.c (signal_nr): Initialize with SIGTERM + instead of literal 15. + * man/start-stop-daemon.8: Refer to signal as TERM instead of + literal 15. + +2009-01-04 Guillem Jover guil...@debian.org + * lib/dpkg.h (LOCALLIBDIR): Move macro to ... * dselect/Makefile.am (INCLUDES): ... here, as a -D argument. diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8 index 5941751..c07411d 100644 --- a/man/start-stop-daemon.8 +++ b/man/start-stop-daemon.8 @@ -1,4 +1,4 @@ -.TH start\-stop\-daemon 8 2008-01-30 Debian Project dpkg utilities +.TH start\-stop\-daemon 8 2009-01-04 Debian Project dpkg utilities .SH NAME start\-stop\-daemon \- start and stop system daemon programs . @@ -105,7 +105,7 @@ Change to \fIgroup\fP or \fIgid\fP when starting the process. .BR \-s , \-\-signal \fIsignal\fP With .BR \-\-stop , -specifies the signal to send to processes being stopped (default 15). +specifies the signal to send to processes being stopped (default TERM). .TP .BR \-R , \-\-retry \fItimeout\fP|\fIschedule\fP With diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 10c15f4..5a5c921 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -110,7 +110,7 @@ static int start = 0; static int stop = 0; static int background = 0; static int mpidfile = 0; -static int signal_nr = 15; +static int signal_nr = SIGTERM; static int user_id = -1; static int runas_uid = -1; static int runas_gid = -1; -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-209-gd1cea90
The following commit has been merged in the master branch:
commit d1cea90edc826a095ed7c86f1eb5655dd4dc1707
Author: Guillem Jover guil...@debian.org
Date: Mon Jan 5 00:55:44 2009 +0200
dpkg: Use warning function instead of hand crafted fprintf call
diff --git a/ChangeLog b/ChangeLog
index 44c5122..4c10348 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-01-05 Guillem Jover guil...@debian.org
+ * src/main.c (setobsolete): Use warning instead of fprintf call.
+ (setforce): Likewise.
+
+2009-01-05 Guillem Jover guil...@debian.org
+
* man/start-stop-daemon.8: Clarify that the signal sent by default
is TERM not KILL.
diff --git a/src/main.c b/src/main.c
index 129e54c..c892af3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -216,7 +216,7 @@ static void setaction(const struct cmdinfo *cip, const char
*value) {
}
static void setobsolete(const struct cmdinfo *cip, const char *value) {
- fprintf(stderr, _(Warning: obsolete option `--%s'\n),cip-olong);
+ warning(_(obsolete option '--%s'\n), cip-olong);
}
static void setdebug(const struct cmdinfo *cpi, const char *value) {
@@ -374,8 +374,7 @@ static void setforce(const struct cmdinfo *cip, const char
*value) {
if (fip-opt)
*fip-opt= cip-arg;
else
- fprintf(stderr, _(Warning: obsolete force/refuse option `%s'\n),
- fip-name);
+ warning(_(obsolete force/refuse option '%s'\n), fip-name);
}
if (!comma) break;
value= ++comma;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-210-g954af98
The following commit has been merged in the master branch: commit 954af98fd713209b28c1f201bbaa86f47a25de6d Author: Guillem Jover guil...@debian.org Date: Thu Nov 20 05:58:26 2008 +0200 Update usertags diff --git a/debian/usertags b/debian/usertags index 5738959..8e26281 100644 --- a/debian/usertags +++ b/debian/usertags @@ -19,17 +19,20 @@ usertag pseudo-tag description assert [ASSERT]Errors caused by assert(). segfault [SEGFAULT] Errors that cause segmentation faults. conffile [CONFFILE] Issues with configuration file handling. +symlinkIssues related to symlink handling. depends[DEPENDS] Issues with dependency relationship handling. maint-script Errors related to maintainer scripts. db Issues handling the database. +file-metadata File metadata tracking (perm, acl, cap, hash). trivial[TRIVIAL] Bug should be trivial to fix. perf [PERF] Performance problems. new-field Request for new control file fields. new-option Request for new command-line option. -wig-and-penWigPen (aka dpkg-source v2). +deb-format Changes to the binary (.deb) format. +dsc-format Changes to the source (.dsc) format. arch [ARCH] Updates to ‘cputable’, ‘ostable’ and porting patches. -not-debian Errors not affecting Debian systems. +vendor Vendor support and needed modifications. i18n [UTF-8] Conversion to the UTF-8 encoding. i18n [INTL] Internationalization problems. l10n [INTL] New or updated translations and bugs affecting @@ -44,8 +47,7 @@ Being considered tags usertagdescription ------ -integrity/auditIntegrity support (sign, hash, stat tracking). -after-etch Bugs to be fixed after this release. +diversion Issues related to diversions. apt-feature?? Program tags @@ -76,12 +78,15 @@ dpkg-statoverride [DPKG-STATOVERRIDE] s-s-d [S-S-D] start-stop-daemon u-a[U-A] update-alternatives +libdpkg-perl Dpkg perl modules. + cleanup-info [CLEANUP-INFO] install-info [INSTALL-INFO] 822-date [822-DATE] dpkg-dev Those should be reassigned to the dpkg-dev package. + [DSELECT] Those should be reassigned to the dselect package. @@ -93,7 +98,7 @@ user d...@packages.debian.org usercategory dpkg-program * Program - + dpkg [tag=dpkg] + + dpkg program [tag=dpkg] + dpkg-architecture [tag=dpkg-architecture] + dpkg-buildpackage [tag=dpkg-buildpackage] + dpkg-checkbuilddeps [tag=dpkg-checkbuilddeps] @@ -112,6 +117,7 @@ usercategory dpkg-program + dpkg-source [tag=dpkg-source] + dpkg-split [tag=dpkg-split] + dpkg-statoverride [tag=dpkg-statoverride] + + Dpkg perl modules [tag=libdpkg-perl] + start-stop-daemon [tag=s-s-d] + update-alternatives [tag=u-a] + 822-date [tag=822-date] @@ -132,15 +138,18 @@ usercategory dpkg-class + Assertion failure [assert] + Dependency relationship handling [depends] + Conffile handling [conffile] + + Symlink handling [symlink] + Database handling [db] + + File metadata tracking [file-metadata] + Maintainer script handling [maint-script] + Performance issue [perf] + Trivial fix [trivial] + New control field [new-field] + New command-line option [new-option] - + Wig and Pen [wig-and-pen] + + Binary package format [deb-format] + + Source package format [dsc-format] + Architecture specific issue [arch] - + Non-Debian issue [not-debian] + + Vendor specific issue [vendor] + Internationalization [i18n] + Localization [l10n] + Documentation [doc] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-214-ga5908b7
The following commit has been merged in the master branch:
commit a5908b7ddb65d84650f0dab407097bdbca6a2cc2
Author: Guillem Jover guil...@debian.org
Date: Wed Jan 14 11:46:24 2009 +0200
s-s-d: Support setting the process scheduler policy and priority
Add new option -P, --procsched policy[:priority].
Closes: #175740
diff --git a/ChangeLog b/ChangeLog
index 8383951..ad1ddf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2009-01-14 Guillem Jover guil...@debian.org
+ * man/start-stop-daemon.8: Document new option --procsched.
+ * utils/start-stop-daemon.c [_POSIX_PRIORITY_SCHEDULING]: Include
+ sched.h.
+ [!_POSIX_PRIORITY_SCHEDULING]: Define SCHED_OTHER, SCHED_FIFO and
+ SCHED_RR with dummy values.
+ (struct res_schedule): New type.
+ (proc_sched): New variable.
+ (do_help): Document --procsched.
+ (parse_proc_schedule, set_proc_schedule): New functions.
+ (parse_options): Add 'procsched' to longopts. Add 'P:' to getopt_long
+ call. Handle 'P' as getopt_long return value. Call parse_proc_schedule
+ if proc_schedule_str is not NULL.
+ (main): Print proc_sched values if --test is used. Call
+ set_proc_schedule if proc_sched is not NULL.
+
+2009-01-14 Guillem Jover guil...@debian.org
+
* utils/start-stop-daemon.c (xstrdup): New function.
(parse_options): Use xstrdup instead of strdup.
diff --git a/debian/changelog b/debian/changelog
index 1340300..3904d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
permissions. Closes: #502496
* Make start-stop-daemon behave the same way whether --chuid gets a user
name or a uid. Closes: #368000
+ * Add new option --procsched to start-stop-daemon to be able to set the
+process scheduling policy and priority. Closes: #175740
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 7e8bbe2..26996b9 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -219,6 +219,12 @@ code for them to do this themselves.
.BR \-N , \-\-nicelevel \fIint\fP
This alters the priority of the process before starting it.
.TP
+.BR \-P , \-\-procsched \fIpolicy\fP\fB:\fP\fIpriority\fP
+This alters the process scheduler policy and priority of the process before
+starting it. The priority can be optionally specified by appending a \fB:\fP
+followed by the value. The default \fIpriority\fP is 0. The currently
+supported policy values are \fBother\fP, \fBfifo\fP and \fBrr\fP.
+.TP
.BR \-k , \-\-umask \fImask\fP
This sets the umask of the process before starting it.
.TP
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index a12a0fe..8171dc3 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -91,6 +91,14 @@
#include assert.h
#include ctype.h
+#ifdef _POSIX_PRIORITY_SCHEDULING
+#include sched.h
+#else
+#define SCHED_OTHER -1
+#define SCHED_FIFO -1
+#define SCHED_RR -1
+#endif
+
#ifdef HAVE_SYS_CDEFS_H
#include sys/cdefs.h
#endif
@@ -142,6 +150,13 @@ struct pid_list {
static struct pid_list *found = NULL;
static struct pid_list *killed = NULL;
+/* Resource scheduling policy. */
+struct res_schedule {
+ const char *policy_name;
+ int policy;
+ int priority;
+};
+
struct schedule_item {
enum {
sched_timeout,
@@ -152,6 +167,8 @@ struct schedule_item {
int value; /* Seconds, signal no., or index into array */
};
+static struct res_schedule *proc_sched = NULL;
+
static int schedule_length;
static struct schedule_item *schedule = NULL;
@@ -319,6 +336,9 @@ do_help(void)
-r|--chroot directory chroot to directory before starting\n
-d|--chdir directorychange to directory (default is /)\n
-N|--nicelevel incr add incr to the process's nice level\n
+ -P|--procsched policy[:prio]\n
+use policy with prio for the kernel\n
+ process scheduler (default prio is 0)\n
-k|--umask mask change the umask to mask before starting\n
-b|--background force the process to detach\n
-m|--make-pidfile create the pidfile before starting\n
@@ -334,6 +354,9 @@ do_help(void)
forever repeat remainder forever\n
or schedule may be just timeout, meaning
signal/timeout/KILL/timeout\n
\n
+The process scheduler policy can be one of:\n
+ other, fifo or rr\n
+\n
Exit status: 0 = done 1 = nothing done (= 0 if --oknodo)\n
3 = trouble 2 = with --retry, processes wouldn't die\n);
}
@@ -431,6 +454,58 @@ parse_umask(const char *string, int *value_r)
}
static void
+parse_proc_schedule(const char *string)
+{
+ char *policy_str, *prio_str;
+ int prio = 0, prio_min, prio_max
[SCM] dpkg's main repository branch, master, updated. 1.14.23-220-g6d08e24
The following commit has been merged in the master branch: commit db9645cff36a3fff3c597764fb8d49fbc819bad7 Author: Guillem Jover guil...@debian.org Date: Thu Nov 20 06:03:57 2008 +0200 Sanitize --status-fd output by replacing newlines with spaces Closes: #505172 diff --git a/ChangeLog b/ChangeLog index 341a01a..43273c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-01-22 Guillem Jover guil...@debian.org + * lib/log.c (statusfd_send): Use varbufsubstc to replace new lines + with spaces. + +2009-01-22 Guillem Jover guil...@debian.org + * lib/dpkg-db.h (varbufsubstc): New function prototype. * lib/varbuf.c (varbufsubstc): New function definition. * lib/test/t-varbuf.c (test_varbuf_substc): New function. diff --git a/debian/changelog b/debian/changelog index 716876b..3658d94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low * Add new option --procsched to start-stop-daemon to be able to set the process scheduling policy and priority. Closes: #175740 * Add initial C unit test suite for libdpkg. + * Sanitize --status-fd output by replacing newlines with spaces. +Closes: #505172 [ Raphael Hertzog ] * Enhance dpkg-shlibdeps's error message when a library can't be found to diff --git a/lib/log.c b/lib/log.c index 6852931..bfd5177 100644 --- a/lib/log.c +++ b/lib/log.c @@ -89,6 +89,9 @@ statusfd_send(const char *fmt, ...) va_start(al, fmt); varbufreset(vb); varbufvprintf(vb, fmt, al); + /* Sanitize string to not include new lines, as front-ends should be +* doing their own word-wrapping. */ + varbufsubstc(vb, '\n', ' '); varbufaddc(vb, '\n'); va_end(al); -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-220-g6d08e24
The following commit has been merged in the master branch: commit 6d08e24e768558a45f94ab72a14904acf845b473 Author: Guillem Jover guil...@debian.org Date: Fri Jan 23 04:12:01 2009 +0200 Cleanup .gitignore files Move common ignore matches to the top-level .gitignore. Force directory matching by adding a trailing /. Remove unused matches (enoent). Add missing matches (t.tmp and autom4te.cache/). diff --git a/.gitignore b/.gitignore index 3134a00..0c0fc20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,16 @@ -build-tree -config -ABOUT-NLS -INSTALL +# Inherited ignores +*.a +*.o +.deps/ Makefile Makefile.in + +# Top dir ignores +autom4te.cache/ +build-tree/ +config/ +ABOUT-NLS +INSTALL configure config.* aclocal.m4 diff --git a/dpkg-deb/.gitignore b/dpkg-deb/.gitignore index fbdfcef..135d53c 100644 --- a/dpkg-deb/.gitignore +++ b/dpkg-deb/.gitignore @@ -1,5 +1 @@ -*.o -.deps -Makefile -Makefile.in dpkg-deb diff --git a/dpkg-split/.gitignore b/dpkg-split/.gitignore index af58309..dedc3fc 100644 --- a/dpkg-split/.gitignore +++ b/dpkg-split/.gitignore @@ -1,6 +1,2 @@ -*.o -.deps -Makefile -Makefile.in dpkg-split mksplit diff --git a/dselect/.gitignore b/dselect/.gitignore index d4c3975..cce16ad 100644 --- a/dselect/.gitignore +++ b/dselect/.gitignore @@ -1,6 +1,2 @@ -*.o -.deps -Makefile -Makefile.in curkeys.h dselect diff --git a/dselect/methods/.gitignore b/dselect/methods/.gitignore deleted file mode 100644 index 282522d..000 --- a/dselect/methods/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/dselect/po/.gitignore b/dselect/po/.gitignore index 7a60b8e..4b5aa2c 100644 --- a/dselect/po/.gitignore +++ b/dselect/po/.gitignore @@ -1,6 +1,4 @@ *.gmo *.sed -Makefile -Makefile.in POTFILES stamp-po diff --git a/lib/.gitignore b/lib/.gitignore index b29a435..ad7739a 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,6 +1 @@ -*.a -*.o -.deps -Makefile -Makefile.in trigdeferred.c diff --git a/libcompat/.gitignore b/libcompat/.gitignore deleted file mode 100644 index 83fafd5..000 --- a/libcompat/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.a -*.o -.deps -Makefile -Makefile.in diff --git a/man/.gitignore b/man/.gitignore index f267408..905daef 100644 --- a/man/.gitignore +++ b/man/.gitignore @@ -7,6 +7,4 @@ pl pt_BR ru sv -Makefile -Makefile.in man.stamp diff --git a/origins/.gitignore b/origins/.gitignore deleted file mode 100644 index 282522d..000 --- a/origins/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/po/.gitignore b/po/.gitignore index 587f4f8..01e3875 100644 --- a/po/.gitignore +++ b/po/.gitignore @@ -2,8 +2,6 @@ *.sin *.sed *.header -Makefile -Makefile.in Makefile.in.in Makevars.template POTFILES diff --git a/scripts/.gitignore b/scripts/.gitignore index ede2efb..4857018 100644 --- a/scripts/.gitignore +++ b/scripts/.gitignore @@ -1,5 +1,3 @@ -Makefile -Makefile.in dpkg-architecture dpkg-buildpackage dpkg-checkbuilddeps @@ -20,3 +18,4 @@ install-info install-info-stamp cleanup-info 822-date +t.tmp diff --git a/scripts/po/.gitignore b/scripts/po/.gitignore index 7a60b8e..4b5aa2c 100644 --- a/scripts/po/.gitignore +++ b/scripts/po/.gitignore @@ -1,6 +1,4 @@ *.gmo *.sed -Makefile -Makefile.in POTFILES stamp-po diff --git a/src/.gitignore b/src/.gitignore index aff0d4f..9b61029 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,7 +1,3 @@ -*.o -.deps -Makefile -Makefile.in dpkg dpkg-query dpkg-trigger diff --git a/utils/.gitignore b/utils/.gitignore index e63b785..bf5714e 100644 --- a/utils/.gitignore +++ b/utils/.gitignore @@ -1,6 +1 @@ -*.o -.deps -Makefile -Makefile.in -enoent start-stop-daemon -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-220-g6d08e24
The following commit has been merged in the master branch:
commit d186c839db61e96d7ad66e6ce04ea02aada8f206
Author: Guillem Jover guil...@debian.org
Date: Tue Jan 20 01:03:55 2009 +0200
libdpkg: Use size_t in functions taking a size argument
diff --git a/ChangeLog b/ChangeLog
index ad1ddf5..82859e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-20 Guillem Jover guil...@debian.org
+
+ * lib/dpkg-db.h (varbufdupc): Use size_t instead of ssize_t.
+ (varbufaddbuf): Use size_t instead of const int.
+ (nfstrnsave): Use size_t instead of int.
+
2009-01-14 Guillem Jover guil...@debian.org
* man/start-stop-daemon.8: Document new option --procsched.
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 9111bee..c9c7489 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -379,7 +379,7 @@ struct varbuf;
#define VARBUF_INIT { 0, 0, NULL }
extern void varbufaddc(struct varbuf *v, int c);
-extern void varbufdupc(struct varbuf *v, int c, ssize_t s);
+extern void varbufdupc(struct varbuf *v, int c, size_t s);
int varbufprintf(struct varbuf *v, const char *fmt, ...) PRINTFFORMAT(2,3);
int varbufvprintf(struct varbuf *v, const char *fmt, va_list va);
void varbufinit(struct varbuf *v, size_t size);
@@ -387,7 +387,7 @@ void varbufreset(struct varbuf *v);
void varbufextend(struct varbuf *v);
void varbuffree(struct varbuf *v);
#define varbufaddstr(v, s) varbufaddbuf(v, s, strlen(s))
-extern void varbufaddbuf(struct varbuf *v, const void *s, const int l);
+extern void varbufaddbuf(struct varbuf *v, const void *s, size_t l);
/* varbufinit must be called exactly once before the use of each varbuf
* (including before any call to varbuffree), or the variable must be
@@ -446,7 +446,7 @@ int epochsdiffer(const struct versionrevision *a,
/*** from nfmalloc.c ***/
extern void *nfmalloc(size_t);
char *nfstrsave(const char*);
-char *nfstrnsave(const char*, int);
+char *nfstrnsave(const char*, size_t);
void nffreeall(void);
/*** from showpkg.c ***/
diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index a6950a8..5449edd 100644
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -60,7 +60,9 @@ char *nfstrsave(const char *string) {
return obstack_copy0 (db_obs, string, strlen(string));
}
-char *nfstrnsave(const char *string, int l) {
+char *
+nfstrnsave(const char *string, size_t l)
+{
OBSTACK_INIT;
return obstack_copy0 (db_obs, string, l);
}
diff --git a/lib/varbuf.c b/lib/varbuf.c
index 71068a8..eecdd45 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -35,7 +35,9 @@ varbufaddc(struct varbuf *v, int c)
v-buf[v-used++]= c;
}
-void varbufdupc(struct varbuf *v, int c, ssize_t n) {
+void
+varbufdupc(struct varbuf *v, int c, size_t n)
+{
size_t old_used = v-used;
v-used += n;
@@ -74,7 +76,9 @@ int varbufvprintf(struct varbuf *v, const char *fmt, va_list
va) {
return r;
}
-void varbufaddbuf(struct varbuf *v, const void *s, const int l) {
+void
+varbufaddbuf(struct varbuf *v, const void *s, size_t l)
+{
int ou;
ou= v-used;
v-used += l;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.23-220-g6d08e24
The following commit has been merged in the master branch:
commit b85e48d40910afd1f38d46e43ef40176fcbab28f
Author: Guillem Jover guil...@debian.org
Date: Thu Jan 22 20:38:09 2009 +0200
libdpkg: Add a new varbufsubstc function
diff --git a/ChangeLog b/ChangeLog
index 3d2d0ae..341a01a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-01-22 Guillem Jover guil...@debian.org
+ * lib/dpkg-db.h (varbufsubstc): New function prototype.
+ * lib/varbuf.c (varbufsubstc): New function definition.
+ * lib/test/t-varbuf.c (test_varbuf_substc): New function.
+ (test): Call test_varbuf_substc.
+
+2009-01-22 Guillem Jover guil...@debian.org
+
* configure.ac (AC_CONFIG_FILES): Add 'lib/test/Makefile'.
* lib/Makefile.am (SUBDIRS): New variable.
* lib/dpkg-test.h: New file.
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index 7ed8d7b..2d85995 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -380,6 +380,7 @@ struct varbuf;
extern void varbufaddc(struct varbuf *v, int c);
extern void varbufdupc(struct varbuf *v, int c, size_t s);
+extern void varbufsubstc(struct varbuf *v, int c_src, int c_dst);
int varbufprintf(struct varbuf *v, const char *fmt, ...) PRINTFFORMAT(2,3);
int varbufvprintf(struct varbuf *v, const char *fmt, va_list va);
void varbufinit(struct varbuf *v, size_t size);
diff --git a/lib/test/t-varbuf.c b/lib/test/t-varbuf.c
index 2de4e95..4157b84 100644
--- a/lib/test/t-varbuf.c
+++ b/lib/test/t-varbuf.c
@@ -125,6 +125,23 @@ test_varbuf_dupc(void)
}
static void
+test_varbuf_substc(void)
+{
+ struct varbuf vb;
+
+ varbufinit(vb, 5);
+
+ varbufaddbuf(vb, 1234a5678a9012a, 15);
+
+ varbufsubstc(vb, 'a', 'z');
+ test_pass(vb.used == 15);
+ test_pass(vb.size = vb.used);
+ test_mem(vb.buf, ==, 1234z5678z9012z, 15);
+
+ varbuffree(vb);
+}
+
+static void
test_varbuf_reset(void)
{
struct varbuf vb;
@@ -153,6 +170,7 @@ test(void)
test_varbuf_addbuf();
test_varbuf_addc();
test_varbuf_dupc();
+ test_varbuf_substc();
test_varbuf_reset();
/* FIXME: Complete. */
diff --git a/lib/varbuf.c b/lib/varbuf.c
index 5ab780e..2b62fb8 100644
--- a/lib/varbuf.c
+++ b/lib/varbuf.c
@@ -46,6 +46,16 @@ varbufdupc(struct varbuf *v, int c, size_t n)
memset(v-buf + old_used, c, n);
}
+void
+varbufsubstc(struct varbuf *v, int c_src, int c_dst)
+{
+ size_t i;
+
+ for (i = 0; i v-used; i++)
+if (v-buf[i] == c_src)
+ v-buf[i] = c_dst;
+}
+
int varbufprintf(struct varbuf *v, const char *fmt, ...) {
int r;
va_list al;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, lenny, updated. 1.14.24-8-g7320bbe
The following commit has been merged in the lenny branch: commit 7320bbe92cd0472e38806e8cedf77bdb95a9b12f Author: Hans F. Nordhaug hans.f.nordh...@himolde.no Date: Sun Feb 1 20:29:44 2009 +0200 Update Norwegian Bokmål dselect translation diff --git a/debian/changelog b/debian/changelog index 17c9449..f172a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ dpkg (1.14.25) UNRELEASED; urgency=low [ Updated dselect translations ] * Basque (Piarres Beobide). Closes: #509852 + * Norwegian Bokmål (Hans F. Nordhaug). * Portuguese (Miguel Figueiredo). Closes: #509904 [ Updated scripts translations ] diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog index 77c0753..743423e 100644 --- a/dselect/po/ChangeLog +++ b/dselect/po/ChangeLog @@ -1,3 +1,7 @@ +2009-02-01 Hans F. Nordhaug hans.f.nordh...@himolde.no + + * nb.po: Updated to 288t. + 2009-01-06 Piarres Beobide p...@beobide.net * eu.po: Updated to 288t. diff --git a/dselect/po/nb.po b/dselect/po/nb.po index b0019d4..892d543 100644 --- a/dselect/po/nb.po +++ b/dselect/po/nb.po @@ -1,22 +1,19 @@ -# translation of dpkg.po to Norwegian Bokmål -# translation of dpkg.po to Norwegian Nynorsk +# Norwegian Bokmål translation of dselect. # Gaute Hvoslef Kvalnes ga...@verdsveven.com, 2003, 2004. # Håvard Korsvoll korsv...@skulelinux.no, 2003, 2004. # Bjorn Steensrud bjor...@powertech.no, 2004. -# Hans Fredrik Nordhaug h...@nordhaug.priv.no, 2005. +# Hans Fredrik Nordhaug h...@nordhaug.priv.no, 2005, 2009. msgid msgstr -Project-Id-Version: dpkg 1.13\n +Project-Id-Version: dselect\n Report-Msgid-Bugs-To: debian-d...@lists.debian.org\n POT-Creation-Date: 2008-03-30 10:09+0300\n -PO-Revision-Date: 2006-10-08 20:27+0100\n +PO-Revision-Date: 2009-02-01 20:24+0200\n Last-Translator: Hans Fredrik Nordhaug h...@nordhaug.priv.no\n Language-Team: Norwegian Bokmål i18n...@lister.ping.ui.no\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Generator: KBabel 1.9.1\n -X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,101\n #: dselect/basecmds.cc:121 msgid Search for ? @@ -142,9 +139,8 @@ msgstr \n #: dselect/baselist.cc:260 -#, fuzzy msgid Keybindings -msgstr hurtigtaster +msgstr Tastetrykk #: dselect/baselist.cc:308 #, c-format @@ -208,19 +204,19 @@ msgstr Tegn sida på nytt #: dselect/bindings.cc:138 msgid Scroll onwards through list by 1 line -msgstr Gå videre gjennom lista med ei linje +msgstr Gå videre gjennom lista med en linje #: dselect/bindings.cc:139 msgid Scroll backwards through list by 1 line -msgstr Gå bakover gjennom lista med ei linje +msgstr Gå bakover gjennom lista med en linje #: dselect/bindings.cc:140 msgid Scroll onwards through help/information by 1 line -msgstr Gå videre gjennom hjelp/informasjon med ei linje +msgstr Gå videre gjennom hjelp/informasjon med en linje #: dselect/bindings.cc:141 msgid Scroll backwards through help/information by 1 line -msgstr Gå bakover gjennom hjelp/informasjon med ei linje +msgstr Gå bakover gjennom hjelp/informasjon med en linje #: dselect/bindings.cc:142 msgid Scroll onwards through list @@ -276,7 +272,7 @@ msgstr Avslutt, avvis forslag til løsning av konflikt/pakkekrav #: dselect/bindings.cc:157 msgid Abort - quit without making changes -msgstr Avbryt - avslutt uten å gjøre endringar +msgstr Avbryt - avslutt uten å gjøre endringer #: dselect/bindings.cc:158 msgid Revert to old state for all packages @@ -291,9 +287,8 @@ msgid Revert to directly requested state for all packages msgstr Gå tilbake til direkte etterspurt tilstand for alle pakker #: dselect/bindings.cc:161 -#, fuzzy msgid Revert to currently installed state for all packages -msgstr Gå tilbake til direkte etterspurt tilstand for alle pakker +msgstr Gå tilbake til nåværende installert tilstand for alle pakker #: dselect/bindings.cc:164 msgid Select currently-highlighted access method @@ -308,7 +303,6 @@ msgid Keystrokes msgstr Taster #: dselect/helpmsgs.cc:25 -#, fuzzy msgid Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n j, Down-arrow k, Up-arrow move highlight\n @@ -340,7 +334,7 @@ msgid D set all to Directly requested state n, \\ repeat last search\n msgstr Flyttetaster: Neste/Forrige, Topp/Slutt, Opp/Ned, Fram/Tilbake:\n - n, Pil ned, j p, Pil opp, k flytt markeringen\n + j, Pil ned k, Pil opp flytt markeringen\n N, Page Down, Mellomrom P, Pil opp, Rettetast bla lista 1 side\n ^n ^p bla lista 1 linje\n t, Home e, End hopp øverst/nederst i @@ -466,7 +460,7 @@ msgstr Du bør lese oversikten over taster og forklaringene til skjermbildet. Det \n finnes en god del skjermhjelp som du kan vise ved å trykke på «?».\n \n -Når du er ferdig med å studere lista, kan du avslutta med «Q» eller enter.\n
[SCM] dpkg's main repository branch, master, updated. 1.14.25-224-g4614319
The following commit has been merged in the master branch: commit 471812b0582629d2478ebabdc4e0656a047c8a0d Author: Guillem Jover guil...@debian.org Date: Thu Jan 29 18:17:07 2009 +0200 Make distcheck work Add missing files in _SOURCES and EXTRA_DIST Makefile.am variables. diff --git a/ChangeLog b/ChangeLog index d2f7532..7542685 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-29 Guillem Jover guil...@debian.org + + * lib/Makefile.am (libdpkg_a_SOURCES): Add 'dpkg-test.h'. + * libcompat/Makefile.am (libcompat_a_SOURCES): Add 'compat.h'. + * man/Makefile.am (EXTRA_DIST): Add 'po/ChangeLog'. + 2009-01-27 Raphael Hertzog hert...@debian.org * scripts/t/900_Dpkg_Version.t: Renamed into... diff --git a/lib/Makefile.am b/lib/Makefile.am index 744742a..193de32 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,6 +19,7 @@ libdpkg_a_SOURCES = \ dpkg-i18n.h \ dpkg-db.h \ dpkg-priv.h \ + dpkg-test.h \ dlist.h \ cleanup.c \ compression.c \ diff --git a/libcompat/Makefile.am b/libcompat/Makefile.am index 0b7b1fe..65eac86 100644 --- a/libcompat/Makefile.am +++ b/libcompat/Makefile.am @@ -7,6 +7,7 @@ INCLUDES = \ noinst_LIBRARIES = libcompat.a libcompat_a_SOURCES = \ + compat.h \ gettext.h if !HAVE_GETOPT diff --git a/man/Makefile.am b/man/Makefile.am index 1b5758c..d6ddb08 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -104,6 +104,7 @@ dist_man_MANS = \ update-alternatives.8 EXTRA_DIST = \ + po/ChangeLog \ po/po4a.cfg \ po/dpkg-man.pot -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, lenny, updated. 1.14.25-1-gf271455
The following commit has been merged in the lenny branch: commit f271455ce26dab6d88be7392ac85cb23bc761116 Author: Guillem Jover guil...@debian.org Date: Tue Feb 3 00:29:53 2009 +0200 Bump version to 1.14.26~ diff --git a/ChangeLog b/ChangeLog index 64c3c7a..bf839a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-02-03 Guillem Jover guil...@debian.org + * configure.ac: Bump version to 1.14.26~. + +2009-02-03 Guillem Jover guil...@debian.org + * configure.ac: Release 1.14.25. 2009-02-02 Guillem Jover guil...@debian.org diff --git a/configure.ac b/configure.ac index cdc7121..13ac7f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.14.25], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.14.26~], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index 660e350..5c53bbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dpkg (1.14.26) UNRELEASED; urgency=low + + * + + -- Guillem Jover guil...@debian.org Tue, 03 Feb 2009 00:27:59 +0200 + dpkg (1.14.25) unstable; urgency=low [ Guillem Jover ] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository annotated tag, 1.14.25, created. 1.14.25
The annotated tag, 1.14.25 has been created
at 4082269928ab60b0defe9a66444e2600658a8377 (tag)
tagging 37c5968236909563809c469c7f2aa34b2026ab34 (commit)
replaces 1.14.24
tagged by Guillem Jover
on Tue Feb 3 00:02:41 2009 +0200
- Shortlog
Release 1.14.25
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEABECAAYFAkmHbYEACgkQuW9ciZ2SjJtCrgCgkum6vaRz3IiKu9VWcP49N8XZ
q7sAoKGBVQX70ctz216HVV4fRuND18ZW
=Y9X0
-END PGP SIGNATURE-
Christian Perrier (2):
Add missing space
Completed Basque translation
Deng Xiyue (1):
Update Simplified Chinese dpkg translation
Guillem Jover (5):
Bump version to 1.14.25~
Fix typo in package description ('privides' - 'provides')
Do not lose conffiles while replacing them on the same install run
Regenerate .pot files and merge .po files with them
Release 1.14.25
Hans F. Nordhaug (1):
Update Norwegian Bokmål dselect translation
Miguel Figueiredo (1):
Update Portuguese dselect translation
Piarres Beobide (1):
Update Basque translations
Raphael Hertzog (1):
dpkg-deb: produce GNU tar archives inside .deb
Tetralet (2):
Update Traditional Chinese dpkg translation
Update Traditional Chinese dpkg translation
---
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-234-gd9f2c0b
The following commit has been merged in the master branch: commit 301bbd8a6c61fd76b86e7011d9050152d918aae2 Author: Guillem Jover guil...@debian.org Date: Fri Feb 6 01:07:42 2009 +0200 Remove unneeded cpio dependency from dpkg-dev dpkg-source used to call cpio to handle tar archives, but not anymore for a long time. diff --git a/debian/changelog b/debian/changelog index 955d76e..6f475a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low * Add initial C unit test suite for libdpkg. * Sanitize --status-fd output by replacing newlines with spaces. Closes: #505172 + * Remove unneeded cpio dependency from dpkg-dev. [ Raphael Hertzog ] * Enhance dpkg-shlibdeps's error message when a library can't be found to diff --git a/debian/control b/debian/control index 18ca6d3..368f18f 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Package: dpkg-dev Section: utils Priority: optional Architecture: all -Depends: dpkg (= 1.14.6), perl5, perl-modules, cpio (= 2.4.2-2), bzip2, lzma, +Depends: dpkg (= 1.14.6), perl5, perl-modules, bzip2, lzma, patch (= 2.2-1), make, binutils, libtimedate-perl Recommends: gcc | c-compiler, build-essential Suggests: gnupg, debian-keyring -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-234-gd9f2c0b
The following commit has been merged in the master branch: commit d9f2c0b8be230eccf6bbb2471a0d10141f93a66f Author: Guillem Jover guil...@debian.org Date: Fri Feb 6 02:53:04 2009 +0200 Add kopensolaris support to ostable and triplettable Closes: #509312 diff --git a/ChangeLog b/ChangeLog index 6054b71..f2a8a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-02-06 Guillem Jover guil...@debian.org + * ostable: Add gnu-kopensolaris. + * triplettable: Add gnu-kopensolaris to kopensolaris mapping. + +2009-02-06 Guillem Jover guil...@debian.org + * ostable: Reindent to make room for longer os names. 2009-02-05 Raphael Hertzog hert...@debian.org diff --git a/debian/changelog b/debian/changelog index 6f475a9..3d8d3be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low * Sanitize --status-fd output by replacing newlines with spaces. Closes: #505172 * Remove unneeded cpio dependency from dpkg-dev. + * Add kopensolaris support to ostable and triplettable. Closes: #509312 [ Raphael Hertzog ] * Enhance dpkg-shlibdeps's error message when a library can't be found to diff --git a/ostable b/ostable index 56aa503..9cd8956 100644 --- a/ostable +++ b/ostable @@ -19,6 +19,7 @@ gnulp-linux linux-gnulp linux[^-]*-gnulp gnu-linux linux-gnu linux[^-]*(-gnu.*)? gnu-kfreebsd kfreebsd-gnukfreebsd[^-]*(-gnu.*)? gnu-knetbsdknetbsd-gnu knetbsd[^-]*(-gnu.*)? +gnu-kopensolaris kopensolaris-gnukopensolaris[^-]*(-gnu.*)? gnu-hurd gnu gnu[^-]* bsd-darwin darwin darwin[^-]* bsd-freebsdfreebsd freebsd[^-]* diff --git a/triplettable b/triplettable index 79ca1d0..db4a2ad 100644 --- a/triplettable +++ b/triplettable @@ -8,6 +8,7 @@ gnulp-linux-i386lpia gnu-linux-cpucpu gnu-kfreebsd-cpu kfreebsd-cpu gnu-knetbsd-cpu knetbsd-cpu +gnu-kopensolaris-cpu kopensolaris-cpu gnu-hurd-cpu hurd-cpu bsd-freebsd-cpu freebsd-cpu bsd-openbsd-cpu openbsd-cpu -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-235-g170d5f6
The following commit has been merged in the master branch: commit 170d5f6c9b589cc3282210971dec67660ed89c80 Author: Guillem Jover guil...@debian.org Date: Fri Feb 6 05:06:27 2009 +0200 man: Document in detail the currently supported deb format Ar member names, types of tar archives and data.tar members. diff --git a/ChangeLog b/ChangeLog index f2a8a4a..504ecbd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-02-06 Guillem Jover guil...@debian.org + * man/deb.5: Add detailed information of the currently supported + format. + +2009-02-06 Guillem Jover guil...@debian.org + * ostable: Add gnu-kopensolaris. * triplettable: Add gnu-kopensolaris to kopensolaris mapping. diff --git a/debian/changelog b/debian/changelog index 3d8d3be..e5e61a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low Closes: #505172 * Remove unneeded cpio dependency from dpkg-dev. * Add kopensolaris support to ostable and triplettable. Closes: #509312 + * Document in deb.5 in detail the currently supported format, ar member +names, types of tar archives and data.tar members. [ Raphael Hertzog ] * Enhance dpkg-shlibdeps's error message when a library can't be found to diff --git a/man/deb.5 b/man/deb.5 index 6a9f654..80e296e 100644 --- a/man/deb.5 +++ b/man/deb.5 @@ -1,4 +1,4 @@ -.TH deb 5 2006-02-28 Debian Project Debian +.TH deb 5 2009-02-06 Debian Project Debian .SH NAME deb \- Debian binary package format .SH SYNOPSIS @@ -16,8 +16,14 @@ old format are described in .SH FORMAT The file is an .B ar -archive with a magic number of +archive with a magic value of .BR !arch . +The file names might contain a trailing slash. +.PP +The \fBtar\fP archives currently allowed are, the old-style (v7) format, +the pre-POSIX ustar format, a subset of the GNU format (only the new +style long pathnames and long linknames, supported since dpkg 1.4.1.17). +Unrecognized tar typeflags are considered an error. .PP The first member is named .B debian-binary @@ -45,23 +51,27 @@ tarball may optionally contain an entry for the current directory. .PP The third, last required member is named -.BR data.tar.gz . -It contains the filesystem archive as a gzipped tar archive. +.BR data.tar . +It contains the filesystem as a tar archive, either +not compressed (supported since dpkg 1.10.24), or compressed with +gzip (with \fB.gz\fP extension), +bzip2 (with \fB.bz2\fP extension, supported since dpkg 1.10.24) or +lzma (with \fB.lzma\fP extension, supported since dpkg 1.13.25). .PP These members must occur in this exact order. Current implementations should ignore any additional members after -.BR data.tar.gz . +.BR data.tar . Further members may be defined in the future, and (if possible) will be placed after these three. Any additional members that may need to be inserted before -.B data.tar.gz +.B data.tar and which should be safely ignored by older programs, will have names starting with an underscore, .RB ` _ '. .PP Those new members which won't be able to be safely ignored will be inserted before -.B data.tar.gz +.B data.tar with names starting with something other than underscores, or will (more likely) cause the major version number to be increased. .SH SEE ALSO -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-237-g7d1245e
The following commit has been merged in the master branch:
commit 7d1245eff85d74d872b6ee89f55c8466321e560c
Author: Guillem Jover guil...@debian.org
Date: Sun Feb 8 03:38:57 2009 +0200
libdpkg: Remove unused function ohshitvb
diff --git a/ChangeLog b/ChangeLog
index 504ecbd..ef6bbad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-08 Guillem Jover guil...@debian.org
+
+ * lib/dpkg.h (ohshitvb): Remove function prototype.
+ * lib/ehandle.c (ohshitvb): Remove function definition.
+
2009-02-06 Guillem Jover guil...@debian.org
* man/deb.5: Add detailed information of the currently supported
diff --git a/lib/dpkg.h b/lib/dpkg.h
index f72164b..3ebe394 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -172,7 +172,6 @@ struct varbuf;
void ohshit(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
void ohshitv(const char *fmt, va_list al) NONRETURNING;
void ohshite(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
-void ohshitvb(struct varbuf*) NONRETURNING;
void werr(const char *what) NONRETURNING;
void warning(const char *fmt, ...) PRINTFFORMAT(1, 2);
diff --git a/lib/ehandle.c b/lib/ehandle.c
index 5167d6e..f430469 100644
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -256,16 +256,6 @@ void print_error_fatal(const char *emsg, const char
*contextstring) {
fprintf(stderr, %s: %s\n,thisname,emsg);
}
-void ohshitvb(struct varbuf *vb) {
- char *m;
- varbufaddc(vb,0);
- m= m_malloc(strlen(vb-buf));
- strcpy(m,vb-buf);
- errmsg= m;
-
- run_error_handler();
-}
-
void ohshitv(const char *fmt, va_list al) {
vsnprintf(errmsgbuf,sizeof(errmsgbuf),fmt,al);
errmsg= errmsgbuf;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-250-g9a8b551
The following commit has been merged in the master branch:
commit 8007f14bce53b4d053fd97929173281aeffe
Author: Guillem Jover guil...@debian.org
Date: Tue Feb 10 02:44:59 2009 +0200
dpkg: Rename assertversion to assert_version_support
diff --git a/ChangeLog b/ChangeLog
index 84b10f6..2ff4497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-10 Guillem Jover guil...@debian.org
+
+ * src/enquiry.c (assertversion): Rename to ...
+ (assert_version_support): ... this.
+
2009-02-08 Guillem Jover guil...@debian.org
* lib/dpkg.h (ohshitvb): Remove function prototype.
diff --git a/src/enquiry.c b/src/enquiry.c
index 68e4acb..a2d9402 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -237,9 +237,11 @@ void unpackchk(const char *const *argv) {
if (ferror(stdout)) werr(stdout);
}
-static void assertversion(const char *const *argv,
- struct versionrevision *verrev_buf,
- const char *reqversion) {
+static void
+assert_version_support(const char *const *argv,
+ struct versionrevision *verrev_buf,
+ const char *reqversion)
+{
struct pkginfo *pkg;
if (*argv)
@@ -271,22 +273,22 @@ static void assertversion(const char *const *argv,
void assertpredep(const char *const *argv) {
static struct versionrevision predepversion = { ~0UL, NULL, NULL };
- assertversion(argv,predepversion,1.1.0);
+ assert_version_support(argv, predepversion, 1.1.0);
}
void assertepoch(const char *const *argv) {
static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assertversion(argv,epochversion,1.4.0.7);
+ assert_version_support(argv, epochversion, 1.4.0.7);
}
void assertlongfilenames(const char *const *argv) {
static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assertversion(argv,epochversion,1.4.1.17);
+ assert_version_support(argv, epochversion, 1.4.1.17);
}
void assertmulticonrep(const char *const *argv) {
static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assertversion(argv,epochversion,1.4.1.19);
+ assert_version_support(argv, epochversion, 1.4.1.19);
}
void predeppackage(const char *const *argv) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-250-g9a8b551
The following commit has been merged in the master branch:
commit 7efb708a1f3f645ad102de9c64a0ab7d7ac925a9
Author: Guillem Jover guil...@debian.org
Date: Tue Feb 10 03:10:17 2009 +0200
dpkg: Print correct feature name on --assert-* failures
diff --git a/ChangeLog b/ChangeLog
index 7a304e3..73ee013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-02-10 Guillem Jover guil...@debian.org
+ * src/enquiry.c (assert_version_support): Add new feature_name
+ argument, and use it when printing the output messages. Fix all
+ callers.
+
+2009-02-10 Guillem Jover guil...@debian.org
+
* src/enquiry.c (assert_version_support): Remove reqversion argument.
Do not initialize verrev_buf from reqversion, when the epoch is ~0UL.
(assertpredep): Pass a fully constructed versionrevision to
diff --git a/debian/changelog b/debian/changelog
index 66eb40a..41bb0c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Add kopensolaris support to ostable and triplettable. Closes: #509312
* Document in deb.5 in detail the currently supported format, ar member
names, types of tar archives and data.tar members.
+ * Print correct feature name on «dpkg --assert-*» failures.
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/src/enquiry.c b/src/enquiry.c
index 17bbc18..7840748 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -239,7 +239,8 @@ void unpackchk(const char *const *argv) {
static void
assert_version_support(const char *const *argv,
- struct versionrevision *verrev_buf)
+ struct versionrevision *verrev_buf,
+ const char *feature_name)
{
struct pkginfo *pkg;
@@ -257,33 +258,35 @@ assert_version_support(const char *const *argv,
case stat_triggersawaited:
if (versionsatisfied3(pkg-configversion,verrev_buf,dvr_laterequal))
break;
-printf(_(Version of dpkg with working epoch support not yet configured.\n
-Please use `dpkg --configure dpkg', and then try again.\n));
+printf(_(Version of dpkg with working %s support not yet configured.\n
+ Please use 'dpkg --configure dpkg', and then try again.\n),
+ feature_name);
exit(1);
default:
-printf(_(dpkg not recorded as installed, cannot check for epoch support
!\n));
+printf(_(dpkg not recorded as installed, cannot check for %s support!\n),
+ feature_name);
exit(1);
}
}
void assertpredep(const char *const *argv) {
struct versionrevision version = { 0, 1.1.0, NULL };
- assert_version_support(argv, version);
+ assert_version_support(argv, version, _(Pre-Depends field));
}
void assertepoch(const char *const *argv) {
struct versionrevision version = { 0, 1.4.0.7, NULL };
- assert_version_support(argv, version);
+ assert_version_support(argv, version, _(epoch));
}
void assertlongfilenames(const char *const *argv) {
struct versionrevision version = { 0, 1.4.1.17, NULL };
- assert_version_support(argv, version);
+ assert_version_support(argv, version, _(long filenames));
}
void assertmulticonrep(const char *const *argv) {
struct versionrevision version = { 0, 1.4.1.19, NULL };
- assert_version_support(argv, version);
+ assert_version_support(argv, version, _(multiple Conflicts and Replaces));
}
void predeppackage(const char *const *argv) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-250-g9a8b551
The following commit has been merged in the master branch:
commit ad0596aaa56277e08efe764373001f4525dd5726
Author: Guillem Jover guil...@debian.org
Date: Tue Feb 10 02:52:50 2009 +0200
dpkg: Pass fully constructed versions to assert_version_support
Remove the missplaced version constructor from inside
assert_version_support, and instead just pass an already initialized
structure. This also allows making the version structures non-static.
diff --git a/ChangeLog b/ChangeLog
index 2ff4497..7a304e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2009-02-10 Guillem Jover guil...@debian.org
+ * src/enquiry.c (assert_version_support): Remove reqversion argument.
+ Do not initialize verrev_buf from reqversion, when the epoch is ~0UL.
+ (assertpredep): Pass a fully constructed versionrevision to
+ assert_version_support, rename versionrevision variable to version
+ and remove static keyword.
+ (assertepoch): Likewise.
+ (assertlongfilenames): Likewise.
+ (assertmulticonrep): Likewise.
+
+2009-02-10 Guillem Jover guil...@debian.org
+
* src/enquiry.c (assertversion): Rename to ...
(assert_version_support): ... this.
diff --git a/src/enquiry.c b/src/enquiry.c
index a2d9402..17bbc18 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -239,8 +239,7 @@ void unpackchk(const char *const *argv) {
static void
assert_version_support(const char *const *argv,
- struct versionrevision *verrev_buf,
- const char *reqversion)
+ struct versionrevision *verrev_buf)
{
struct pkginfo *pkg;
@@ -248,11 +247,7 @@ assert_version_support(const char *const *argv,
badusage(_(--%s takes no arguments), cipaction-olong);
modstatdb_init(admindir,msdbrw_readonly|msdbrw_noavail);
- if (verrev_buf-epoch == ~0UL) {
-verrev_buf-epoch= 0;
-verrev_buf-version= nfstrsave(reqversion);
-verrev_buf-revision = NULL;
- }
+
pkg= findpackage(dpkg);
switch (pkg-status) {
case stat_installed:
@@ -272,23 +267,23 @@ assert_version_support(const char *const *argv,
}
void assertpredep(const char *const *argv) {
- static struct versionrevision predepversion = { ~0UL, NULL, NULL };
- assert_version_support(argv, predepversion, 1.1.0);
+ struct versionrevision version = { 0, 1.1.0, NULL };
+ assert_version_support(argv, version);
}
void assertepoch(const char *const *argv) {
- static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assert_version_support(argv, epochversion, 1.4.0.7);
+ struct versionrevision version = { 0, 1.4.0.7, NULL };
+ assert_version_support(argv, version);
}
void assertlongfilenames(const char *const *argv) {
- static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assert_version_support(argv, epochversion, 1.4.1.17);
+ struct versionrevision version = { 0, 1.4.1.17, NULL };
+ assert_version_support(argv, version);
}
void assertmulticonrep(const char *const *argv) {
- static struct versionrevision epochversion = { ~0UL, NULL, NULL };
- assert_version_support(argv, epochversion, 1.4.1.19);
+ struct versionrevision version = { 0, 1.4.1.19, NULL };
+ assert_version_support(argv, version);
}
void predeppackage(const char *const *argv) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-250-g9a8b551
The following commit has been merged in the master branch:
commit 9a8b551b6bb4f6379905bdd8273b5800f858cbdc
Author: Guillem Jover guil...@debian.org
Date: Tue Feb 10 03:12:02 2009 +0200
dpkg: Rename assert_version_support argument verrev_buf to version
diff --git a/ChangeLog b/ChangeLog
index 73ee013..966012f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-02-10 Guillem Jover guil...@debian.org
+ * src/enquiry.c (assert_version_support): Rename verrev_buf argument
+ to version.
+
+2009-02-10 Guillem Jover guil...@debian.org
+
* src/enquiry.c (assert_version_support): Add new feature_name
argument, and use it when printing the output messages. Fix all
callers.
diff --git a/src/enquiry.c b/src/enquiry.c
index 7840748..d57073a 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -239,7 +239,7 @@ void unpackchk(const char *const *argv) {
static void
assert_version_support(const char *const *argv,
- struct versionrevision *verrev_buf,
+ struct versionrevision *version,
const char *feature_name)
{
struct pkginfo *pkg;
@@ -256,7 +256,7 @@ assert_version_support(const char *const *argv,
break;
case stat_unpacked: case stat_halfconfigured: case stat_halfinstalled:
case stat_triggersawaited:
-if (versionsatisfied3(pkg-configversion,verrev_buf,dvr_laterequal))
+if (versionsatisfied3(pkg-configversion, version, dvr_laterequal))
break;
printf(_(Version of dpkg with working %s support not yet configured.\n
Please use 'dpkg --configure dpkg', and then try again.\n),
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-258-ga305ec0
The following commit has been merged in the master branch:
commit a305ec0756afcb59223d3e6870ba703ae5ddf634
Author: Guillem Jover guil...@debian.org
Date: Fri Feb 13 07:57:01 2009 +0200
Remove bogus comment about '--yet-to-unpack'
diff --git a/ChangeLog b/ChangeLog
index 35d9985..a912d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-13 Guillem Jover guil...@debian.org
+
+ * src/query.c: Remove bogus comment about '--yet-to-unpack'.
+
2009-02-11 Raphael Hertzog hert...@debian.org
* scripts/Makefile.am: Drop cleanup-info.pl script.
diff --git a/src/query.c b/src/query.c
index b7ba2f6..31597af 100644
--- a/src/query.c
+++ b/src/query.c
@@ -458,10 +458,7 @@ printversion(void)
See %s --license for copyright and license details.\n),
DPKGQUERY) 0) werr(stdout);
}
-/*
- options that need fixing:
- dpkg --yet-to-unpack \n\
- */
+
void
usage(void)
{
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-273-g69c9250
The following commit has been merged in the master branch:
commit 69c9250259d3abb8feb632898e5a495e74a33fc8
Author: Guillem Jover guil...@debian.org
Date: Thu Feb 26 07:35:17 2009 +0200
dpkg: Add progress reporting while reading the file list database
Reading the files database can take a while on machines with slow disks
and an empty cache. To make the wait more tolerable try to display a
progress indicator if the output is a terminal.
Based-on-patch-by: Romain Francoise rfranco...@debian.org
diff --git a/ChangeLog b/ChangeLog
index 1c6b4dd..955fa43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
2009-02-26 Romain Francoise rfranco...@debian.org,
Guillem Jover guil...@debian.org
+ * src/filesdb.c: Include 'progress.h'.
+ (ensure_allinstfiles_available): Call progress_init instead of
+ directly printing. Call progress_step if needing to print on each
+ package iteration. And call progress_done if needing to print when
+ finished.
+
+2009-02-26 Romain Francoise rfranco...@debian.org,
+Guillem Jover guil...@debian.org
+
* lib/Makefile.am (libdpkg_a_SOURCES): Add 'progress.h' and
'progress.c'.
* lib/progress.h: New file.
diff --git a/debian/changelog b/debian/changelog
index 09c6bb7..4d76100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Document in deb.5 in detail the currently supported format, ar member
names, types of tar archives and data.tar members.
* Print correct feature name on «dpkg --assert-*» failures.
+ * Add progress reporting to dpkg while reading the file list database.
+Based on a patch by Romain Francoise.
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/src/filesdb.c b/src/filesdb.c
index e9a1a91..b68b2d2 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -40,6 +40,7 @@
#include dpkg-db.h
#include dpkg-priv.h
+#include progress.h
#include filesdb.h
#include main.h
@@ -214,19 +215,28 @@ void ensure_packagefiles_available(struct pkginfo *pkg) {
void ensure_allinstfiles_available(void) {
struct pkgiterator *it;
struct pkginfo *pkg;
-
+ struct progress progress;
+
if (allpackagesdone) return;
if (saidread2) {
+int max = countpackages();
+
saidread=1;
-printf(_((Reading database ... ));
+progress_init(progress, _((Reading database ... ), max);
}
+
it= iterpkgstart();
- while ((pkg = iterpkgnext(it)) != NULL)
+ while ((pkg = iterpkgnext(it)) != NULL) {
ensure_packagefiles_available(pkg);
+
+if (saidread == 1)
+ progress_step(progress);
+ }
iterpkgend(it);
allpackagesdone= 1;
if (saidread==1) {
+progress_done(progress);
printf(_(%d files and directories currently installed.)\n),nfiles);
saidread=2;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-274-gb0569c7
The following commit has been merged in the master branch:
commit b0569c7d4d744e3902ab606284411dd304ceafc6
Author: Chris Coulson chrisccoul...@googlemail.com
Date: Thu Feb 26 09:06:15 2009 +0200
s-s-d: Support setting the IO scheduler class and priority
Add new option -I, --iosched class[:priority].
Closes: #443535
Signed-off-by: Guillem Jover guil...@debian.org
diff --git a/ChangeLog b/ChangeLog
index 955fa43..49e0bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-02-26 Chris Coulson chrisccoul...@googlemail.com,
+Guillem Jover guil...@debian.org
+
+ * configure.ac (AC_CHECK_HEADERS): Add 'sys/syscall.h'.
+ * man/start-stop-daemon.8: Document new option --iosched.
+ * utils/start-stop-daemon.c [HAVE_SYS_SYSCALL_H]: Include
+ sys/syscall.h.
+ (HAVE_IOPRIO_SET) [SYS_ioprio_set, linux]: New macro.
+ (IOPRIO_CLASS_NONE, IOPRIO_CLASS_RT): New anonymous enum.
+ (IOPRIO_CLASS_BE, IOPRIO_CLASS_IDLE): Likewise.
+ (IOPRIO_WHO_PROCESS, IOPRIO_WHO_PGRP, IOPRIO_WHO_USER): Likewise.
+ (IOPRIO_CLASS_SHIFT, IOPRIO_PRIO_VALUE, IO_SCHED_PRIO_MIN)
+ (IO_SCHED_PRIO_MAX): New macros.
+ (io_sched): New variable.
+ (do_help): Document --iosched.
+ (ioprio_set) [HAVE_IOPRIO_SET]: New function.
+ (parse_io_schedule, set_io_schedule): Likewise.
+ (parse_options): Add 'iosched' to longopts. Add 'I:' to getopt_long
+ call. Handle 'I' as getopt_long return value. Call parse_io_schedule
+ if io_schedule_str is not NULL.
+ (main): Print io_sched values if --test is used. Call set_io_schedule
+ if io_sched is not NULL.
+
2009-02-26 Romain Francoise rfranco...@debian.org,
Guillem Jover guil...@debian.org
diff --git a/configure.ac b/configure.ac
index 53694ca..3d3b607 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,8 @@ fi
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([stddef.h error.h locale.h libintl.h sys/cdefs.h kvm.h])
+AC_CHECK_HEADERS([stddef.h error.h locale.h libintl.h kvm.h \
+ sys/cdefs.h sys/syscall.h])
DPKG_CHECK_DEFINE(TIOCNOTTY, [sys/ioctl.h])
# Checks for typedefs, structures, and compiler characteristics.
diff --git a/debian/changelog b/debian/changelog
index 4d76100..67128bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,9 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Print correct feature name on «dpkg --assert-*» failures.
* Add progress reporting to dpkg while reading the file list database.
Based on a patch by Romain Francoise.
+ * Add new option --iosched to start-stop-daemon to be able to set the
+IO scheduling class and priority. Closes: #443535
+Thanks to Chris Coulson chrisccoul...@googlemail.com.
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 26996b9..1e6c00f 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -225,6 +225,13 @@ starting it. The priority can be optionally specified by
appending a \fB:\fP
followed by the value. The default \fIpriority\fP is 0. The currently
supported policy values are \fBother\fP, \fBfifo\fP and \fBrr\fP.
.TP
+.BR \-I , \-\-iosched \fIclass\fP\fB:\fP\fIpriority\fP
+This alters the IO scheduler class and priority of the process before starting
+it. The priority can be optionally specified by appending a \fB:\fP followed
+by the value. The default \fIpriority\fP is 4, unless \fIclass\fP is
\fBidle\fP,
+then \fIpriority\fP will always be 7. The currently supported values for
+\fIclass\fP are \fBidle\fP, \fBbest-effort\fP and \fBreal-time\fP.
+.TP
.BR \-k , \-\-umask \fImask\fP
This sets the umask of the process before starting it.
.TP
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 8171dc3..34ee022 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -111,6 +111,27 @@
#include error.h
#endif
+#ifdef HAVE_SYS_SYSCALL_H
+#include sys/syscall.h
+#endif
+
+#if defined(SYS_ioprio_set) defined(linux)
+#define HAVE_IOPRIO_SET
+#endif
+
+enum {
+ IOPRIO_WHO_PROCESS = 1,
+ IOPRIO_WHO_PGRP,
+ IOPRIO_WHO_USER,
+};
+
+enum {
+ IOPRIO_CLASS_NONE,
+ IOPRIO_CLASS_RT,
+ IOPRIO_CLASS_BE,
+ IOPRIO_CLASS_IDLE,
+};
+
static int testmode = 0;
static int quietmode = 0;
static int exitnodo = 1;
@@ -136,6 +157,11 @@ static const char *progname = ;
static int nicelevel = 0;
static int umask_value = -1;
+#define IOPRIO_CLASS_SHIFT 13
+#define IOPRIO_PRIO_VALUE(class, prio) (((class) IOPRIO_CLASS_SHIFT) |
(prio))
+#define IO_SCHED_PRIO_MIN 0
+#define IO_SCHED_PRIO_MAX 7
+
static struct stat exec_stat;
#if defined(OSHURD)
static struct proc_stat_list *procset = NULL;
@@ -168,6 +194,7 @@ struct schedule_item {
};
static struct res_schedule *proc_sched = NULL;
+static struct
[SCM] dpkg's main repository branch, master, updated. 1.14.25-275-g3949ec8
The following commit has been merged in the master branch: commit 3949ec81bc2f3ddc6d0b62cf46dc61acdd6c2997 Author: Guillem Jover guil...@debian.org Date: Thu Feb 26 09:21:19 2009 +0200 ChangeLog police on early morning shift diff --git a/ChangeLog b/ChangeLog index 49e0bb7..19f5143 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,7 @@ (main): Print io_sched values if --test is used. Call set_io_schedule if io_sched is not NULL. -2009-02-26 Romain Francoise rfranco...@debian.org, +2009-02-26 Romain Francoise rfranco...@debian.org, Guillem Jover guil...@debian.org * src/filesdb.c: Include 'progress.h'. @@ -30,7 +30,7 @@ package iteration. And call progress_done if needing to print when finished. -2009-02-26 Romain Francoise rfranco...@debian.org, +2009-02-26 Romain Francoise rfranco...@debian.org, Guillem Jover guil...@debian.org * lib/Makefile.am (libdpkg_a_SOURCES): Add 'progress.h' and @@ -271,7 +271,7 @@ an alternative is switched to manual mode. 2009-02-05 Raphael Hertzog hert...@debian.org - Osamu Aoki os...@debian.org +Osamu Aoki os...@debian.org * scripts/update-alternatives.pl: Allow --config to continue when the currently selected alternative doesn't match the only existing @@ -1677,7 +1677,7 @@ * scripts/dpkg-divert.pl: Do not silently force --rename on --remove. -2008-06-17 Juergen Kreileder j...@blackdown.de, +2008-06-17 Juergen Kreileder j...@blackdown.de, Guillem Jover guil...@debian.org * scripts/dpkg-divert.pl (rename_mv): New function. @@ -2300,7 +2300,7 @@ * scripts/Dpkg/Source/Package.pm: Add missing import of subprocerr. -2008-04-12 Russell Coker russ...@coker.com.au, +2008-04-12 Russell Coker russ...@coker.com.au, Guillem Jover guil...@debian.org * src/archives.c (tarobject): Set scontext to NULL after freecon. diff --git a/po/ChangeLog b/po/ChangeLog index 12591a1..3bf9028 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -62,7 +62,7 @@ * pt_BR.po: Updated to 986t. -2008-11-17 Hans Fredrik Nordhaug h...@nordhaug.priv.no +2008-11-17 Hans Fredrik Nordhaug h...@nordhaug.priv.no * nb.po: Updated to 986t. @@ -132,7 +132,7 @@ * vi.po: Updated to 985t. -2008-09-05 Hans Fredrik Nordhaug h...@nordhaug.priv.no +2008-09-05 Hans Fredrik Nordhaug h...@nordhaug.priv.no * nb.po: Updated to 985t. @@ -140,11 +140,11 @@ * eu.po: Updated to 985t. -2008-08-29 Jacobo Tarrio jtar...@debian.org +2008-08-29 Jacobo Tarrio jtar...@debian.org * gl.po: Updated to 985t. -2008-08-29 Daniel Nylander p...@danielnylander.se +2008-08-29 Daniel Nylander p...@danielnylander.se * sv.po: Updated to 985t. @@ -160,7 +160,7 @@ * cs.po: Updated to 985t. -2008-08-20 Eddy Petrișor eddy.petri...@gmail.com +2008-08-20 Eddy Petrișor eddy.petri...@gmail.com * ro.po: Updated to 985t. @@ -189,7 +189,7 @@ * lt.po: Added as 626t54f304u. -2008-07-29 Eddy Petrișor eddy.petri...@gmail.com +2008-07-29 Eddy Petrișor eddy.petri...@gmail.com * ro.po: Updated to 984t (port from lenny branch). @@ -213,7 +213,7 @@ * ru.po: Updated to 984t. -2008-06-28 Eddy Petrișor eddy.petri...@gmail.com +2008-06-28 Eddy Petrișor eddy.petri...@gmail.com * ro.po: Updated to 984t. diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog index e5b3346..25159a1 100644 --- a/scripts/po/ChangeLog +++ b/scripts/po/ChangeLog @@ -4,7 +4,7 @@ 2009-02-05 Wiktor Wandachowicz sir...@gmail.com - * pl.po: Updated to 472t + * pl.po: Updated to 472t. 2009-01-02 Guillem Jover guil...@debian.org @@ -12,20 +12,20 @@ 2008-01-05 Christian Perrier bubu...@debian.org - * fr.po: missing space added (devriez définir) + * fr.po: Missing space added (devriez définir). 2008-12-29 Guillem Jover guil...@debian.org * dpkg-dev.pot: Regenerated. * *.po: Merged with dpkg-dev.pot. -2008-12-27 Helge Kreutzmann deb...@helgefjell.de +2008-12-27 Helge Kreutzmann deb...@helgefjell.de - * de.po: Change translation of Usage + * de.po: Change translation of Usage. 2008-11-15 Christian Perrier bubu...@debian.org - * fr.po: Updated to 473t + * fr.po: Updated to 473t. 2008-11-14 Guillem Jover guil...@debian.org @@ -34,11 +34,11 @@ 2008-11-01 Christian Perrier bubu...@debian.org - * fr.po: Fix wrong translation (#504123) + * fr.po: Fix wrong translation (#504123). 2008-09-23 Yuri Kozlov kozlo...@gmail.com - * ru.po: Fix typo (#499736) + * ru.po: Fix typo (#499736). 2008-08-29 Peter Krefting pet...@debian.org @@ -125,7 +125,7 @@ 2008-05-05 Helge Kreutzmann deb...@helgefjell.de - * de.po: Updated to 467t0f2u. / a minor fix
[SCM] dpkg's main repository branch, master, updated. 1.14.25-276-g6da7aab
The following commit has been merged in the master branch: commit 6da7aabc152c3c17da0aa97f9b10bf89c0e9cb5e Author: Guillem Jover guil...@debian.org Date: Fri Feb 27 04:19:24 2009 +0200 Add bug closure for Slovak translation Forgotten in commit 4e48feb813cf551183f2aac1540a15340501fe27. diff --git a/debian/changelog b/debian/changelog index 67128bd..56e71e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -189,7 +189,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low * Portuguese (Miguel Figueiredo). * Korean (Changwoo Ryu). * Romanian (Eddy Petrișor) - * Slovak (Ivan Masár) + * Slovak (Ivan Masár). Closes: #514490 -- Guillem Jover guil...@debian.org Tue, 29 Jul 2008 02:34:59 +0300 -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-281-g53b1f88
The following commit has been merged in the master branch:
commit 22408d0c3dac33a396a451e18f1e8860793928d3
Author: Guillem Jover guil...@debian.org
Date: Fri Feb 27 06:16:03 2009 +0200
libdpkg: Add tar format detection support
Recognize old tar, GNU tar and ustar formats. Abort on ustar with non
empty Prefix field, as we don't properly handle the long names yet.
Failure for PAX archive is already being handled when acting on the
typeflag.
diff --git a/ChangeLog b/ChangeLog
index f29e33d..03fc9a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2009-02-27 Guillem Jover guil...@debian.org
+ * lib/tarfn.h (enum tar_format): New type.
+ (struct TarInfo): Add new format member.
+ * lib/tarfn.c (TAR_MAGIC_USTAR, TAR_MAGIC_GNU): New macros.
+ (struct TarHeader): Add new Prefix member.
+ (DecodeTarHeader): Detect tar formats based on the magic values.
+ Abort on tar_format_ustar and an non-empty Prefix.
+
+2009-02-27 Guillem Jover guil...@debian.org
+
* lib/fields.c (f_boolean): Use PKGPFIELD to assign to the correct
member instead of hardcoding to the essential member.
diff --git a/debian/changelog b/debian/changelog
index 1536e0e..e61d165 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Add new option --iosched to start-stop-daemon to be able to set the
IO scheduling class and priority. Closes: #443535
Thanks to Chris Coulson chrisccoul...@googlemail.com.
+ * Add tar format detection support to the internal extractor.
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/lib/tarfn.c b/lib/tarfn.c
index bdf0bb0..ecb5acb 100644
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -18,6 +18,9 @@
#include dpkg.h
#include dpkg-priv.h
+#define TAR_MAGIC_USTAR ustar\0 00
+#define TAR_MAGIC_GNU ustar\0
+
struct TarHeader {
char Name[100];
char Mode[8];
@@ -33,6 +36,7 @@ struct TarHeader {
char GroupName[32];
char MajorDevice[8];
char MinorDevice[8];
+ char Prefix[155]; /* Only valid on ustar. */
};
typedef struct TarHeader TarHeader;
@@ -81,12 +85,22 @@ DecodeTarHeader(char * block, TarInfo * d)
longsum;
longchecksum;
+ if (memcmp(h-MagicNumber, TAR_MAGIC_GNU, 6) == 0)
+ d-format = tar_format_gnu;
+ else if (memcmp(h-MagicNumber, TAR_MAGIC_USTAR, 6) == 0)
+ d-format = tar_format_ustar;
+ else
+ d-format = tar_format_old;
+
if ( *h-UserName )
passwd = getpwnam(h-UserName);
if ( *h-GroupName )
group = getgrnam(h-GroupName);
- d-Name = StoC(h-Name, sizeof(h-Name));
+ if (d-format == tar_format_ustar h-Prefix[0] != '\0')
+ abort();
+ else
+ d-Name = StoC(h-Name, sizeof(h-Name));
d-LinkName = StoC(h-LinkName, sizeof(h-LinkName));
d-Mode = (mode_t)OtoL(h-Mode, sizeof(h-Mode));
d-Size = (size_t)OtoL(h-Size, sizeof(h-Size));
diff --git a/lib/tarfn.h b/lib/tarfn.h
index 4bd0e00..469d476 100644
--- a/lib/tarfn.h
+++ b/lib/tarfn.h
@@ -12,6 +12,13 @@
#include unistd.h
#include sys/types.h
+enum tar_format {
+ tar_format_old,
+ tar_format_gnu,
+ tar_format_ustar,
+ tar_format_pax,
+};
+
enum TarFileType {
NormalFile0 = '\0', /* For compatibility with decades-old bug */
NormalFile1 = '0',
@@ -27,6 +34,7 @@ enum TarFileType {
typedef enum TarFileType TarFileType;
struct TarInfo {
+ enum tar_format format; /* Tar archive format. */
void * UserData; /* User passed this in as argument */
char * Name; /* File name */
mode_t Mode; /* Unix mode, including device bits. */
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-281-g53b1f88
The following commit has been merged in the master branch:
commit 53b1f8871fea748e0360bf9183735ab54f7a1f64
Author: Guillem Jover guil...@debian.org
Date: Fri Feb 27 07:00:17 2009 +0200
libdpkg: Add support for ustar long names using the prefix field
The ustar format has been supported up to now except for the long names
which use the prefix field that needs to be prepended to the name field
if non empty.
Closes: #474092
diff --git a/ChangeLog b/ChangeLog
index 03fc9a4..43aff28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-02-27 Guillem Jover guil...@debian.org
+ * lib/tarfn.c (get_prefix_name): New function.
+ (DecodeTarHeader): On tar_format_ustar and if Prefix is not empty
+ call get_prefix_name instead of aborting.
+ * man/deb.5: Document that ustar format is now properly supported.
+
+2009-02-27 Guillem Jover guil...@debian.org
+
* lib/tarfn.h (enum tar_format): New type.
(struct TarInfo): Add new format member.
* lib/tarfn.c (TAR_MAGIC_USTAR, TAR_MAGIC_GNU): New macros.
diff --git a/debian/changelog b/debian/changelog
index e61d165..7c34446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
IO scheduling class and priority. Closes: #443535
Thanks to Chris Coulson chrisccoul...@googlemail.com.
* Add tar format detection support to the internal extractor.
+ * Add support for ustar long names using the prefix field. Closes: #474092
[ Raphael Hertzog ]
* Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/lib/tarfn.c b/lib/tarfn.c
index ecb5acb..8e90491 100644
--- a/lib/tarfn.c
+++ b/lib/tarfn.c
@@ -74,6 +74,28 @@ StoC(const char *s, int size)
return str;
}
+/* FIXME: Rewrite using varbuf, once it supports the needed functionality. */
+static char *
+get_prefix_name(TarHeader *h)
+{
+ char *prefix, *name, *s;
+
+ /* The size is not going to be bigger than that. */
+ s = m_malloc(257);
+
+ prefix = StoC(h-Prefix, sizeof(h-Prefix));
+ name = StoC(h-Name, sizeof(h-Name));
+
+ strcpy(s, prefix);
+ strcat(s, /);
+ strcat(s, name);
+
+ free(prefix);
+ free(name);
+
+ return s;
+}
+
static int
DecodeTarHeader(char * block, TarInfo * d)
{
@@ -97,8 +119,9 @@ DecodeTarHeader(char * block, TarInfo * d)
if ( *h-GroupName )
group = getgrnam(h-GroupName);
+ /* Concatenate prefix and name to support ustar style long names. */
if (d-format == tar_format_ustar h-Prefix[0] != '\0')
- abort();
+ d-Name = get_prefix_name(h);
else
d-Name = StoC(h-Name, sizeof(h-Name));
d-LinkName = StoC(h-LinkName, sizeof(h-LinkName));
diff --git a/man/deb.5 b/man/deb.5
index 80e296e..c51ed12 100644
--- a/man/deb.5
+++ b/man/deb.5
@@ -1,4 +1,4 @@
-.TH deb 5 2009-02-06 Debian Project Debian
+.TH deb 5 2009-02-27 Debian Project Debian
.SH NAME
deb \- Debian binary package format
.SH SYNOPSIS
@@ -22,7 +22,8 @@ The file names might contain a trailing slash.
.PP
The \fBtar\fP archives currently allowed are, the old-style (v7) format,
the pre-POSIX ustar format, a subset of the GNU format (only the new
-style long pathnames and long linknames, supported since dpkg 1.4.1.17).
+style long pathnames and long linknames, supported since dpkg 1.4.1.17),
+and the POSIX ustar format (long names supported since dpkg 1.15.0).
Unrecognized tar typeflags are considered an error.
.PP
The first member is named
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch:
commit bfcdc34cdf300075fb45883a02acc61c90591b57
Author: Guillem Jover guil...@debian.org
Date: Mon Mar 2 05:27:04 2009 +0200
u-a: Print an actual error on load open instead of an empty string
Otherwise gettext would return the special msgid for the catalog.
diff --git a/ChangeLog b/ChangeLog
index 3d3b8ea..eebd8af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-03-02 Guillem Jover guil...@debian.org
+ * scripts/update-alternatives.pl (load): Print an actual error on open
+ instead of an empty string.
+
+2009-03-02 Guillem Jover guil...@debian.org
+
* scripts/update-alternatives.pl: Do not use non-ASCII strings on C
locale.
(version): Likewise.
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 6447804..37cbd7b 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -748,7 +748,7 @@ sub load {
my ($self, $file, $must_not_die) = @_;
return 0 unless -s $file;
eval {
-open(my $fh, , $file) || error(_g(), $file, $!);
+open(my $fh, , $file) || error(_g(unable to read %s: %s), $file,
$!);
config_helper($fh, $file);
my $status = gl(_g(status));
badfmt(_g(invalid status)) unless $status =~ /^(?:auto|manual)$/;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch:
commit 33a84d38568ef6de0c8becbe9fdea8ee5ad98a65
Author: Guillem Jover guil...@debian.org
Date: Mon Mar 2 06:09:24 2009 +0200
u-a: Fix test suite to use t.tmp from builddir instead of srcdir
This fixes “make distcheck”, as t.tmp is a read/write directory it has
to be used under builddir, which in most cases happens to be the same as
srcdir.
diff --git a/ChangeLog b/ChangeLog
index eebd8af..3ad5363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-03-02 Guillem Jover guil...@debian.org
+ * scripts/t/900_update_alternatives.t: Do not use $srcdir for t.tmp,
+ it's actually located in builddir.
+
+2009-03-02 Guillem Jover guil...@debian.org
+
* scripts/update-alternatives.pl (load): Print an actual error on open
instead of an empty string.
diff --git a/scripts/t/900_update_alternatives.t
b/scripts/t/900_update_alternatives.t
index e2a61bf..da4ba84 100644
--- a/scripts/t/900_update_alternatives.t
+++ b/scripts/t/900_update_alternatives.t
@@ -8,9 +8,9 @@ use strict;
use warnings;
my $srcdir = $ENV{srcdir} || '.';
-my $admindir = File::Spec-rel2abs($srcdir/t.tmp/ua/admindir),
-my $altdir = File::Spec-rel2abs($srcdir/t.tmp/ua/alternatives);
-my $bindir = File::Spec-rel2abs($srcdir/t.tmp/ua/bin);
+my $admindir = File::Spec-rel2abs(t.tmp/ua/admindir),
+my $altdir = File::Spec-rel2abs(t.tmp/ua/alternatives);
+my $bindir = File::Spec-rel2abs(t.tmp/ua/bin);
# XXX: switch to version without .pl
my @ua = ($srcdir/update-alternatives.pl, --log, /dev/null,
--quiet, --admindir, $admindir, --altdir, $altdir);
@@ -56,7 +56,7 @@ plan tests = (4 * ($nb_slaves + 1) + 2) * 24 # number of
check_choices
+ 60; # rest
sub cleanup {
-system(rm -rf $srcdir/t.tmp/ua mkdir -p $admindir mkdir -p
$altdir);
+system(rm -rf t.tmp/ua mkdir -p $admindir mkdir -p $altdir);
system(mkdir -p $bindir/more);
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch: commit 883b6e840f06e7d05e1c6a23824c5aefd3466754 Author: Guillem Jover guil...@debian.org Date: Mon Mar 2 06:23:10 2009 +0200 Bump version to 1.15.1~ diff --git a/configure.ac b/configure.ac index e7be942..ebd7570 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.0], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.1~], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index 51b55ed..4317167 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dpkg (1.15.1) UNRELEASED; urgency=low + + * + + -- Guillem Jover guil...@debian.org Mon, 02 Mar 2009 06:22:36 +0200 + dpkg (1.15.0) experimental; urgency=low [ Guillem Jover ] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch: commit 9f3fb231f12f2a3394c2f2b63aedd685cd8627c9 Author: Guillem Jover guil...@debian.org Date: Mon Mar 2 06:13:21 2009 +0200 Release 1.15.0 diff --git a/ChangeLog b/ChangeLog index 3ad5363..35cf98e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-03-02 Guillem Jover guil...@debian.org + * configure.ac: Release 1.15.0. + +2009-03-02 Guillem Jover guil...@debian.org + * scripts/t/900_update_alternatives.t: Do not use $srcdir for t.tmp, it's actually located in builddir. diff --git a/configure.ac b/configure.ac index 3d3b607..e7be942 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.0~], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.0], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index 753e346..51b55ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dpkg (1.15.0) UNRELEASED; urgency=low +dpkg (1.15.0) experimental; urgency=low [ Guillem Jover ] * Do not suggest manually changing the alternative symlinks on @@ -200,7 +200,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low * Romanian (Eddy Petrișor) * Slovak (Ivan Masár). Closes: #514490 - -- Guillem Jover guil...@debian.org Tue, 29 Jul 2008 02:34:59 +0300 + -- Guillem Jover guil...@debian.org Mon, 02 Mar 2009 06:13:53 +0200 dpkg (1.14.25) unstable; urgency=low -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch: commit 1a0b8ade8f5f5130f77415f86f1686e8c097b768 Author: Guillem Jover guil...@debian.org Date: Mon Mar 2 06:56:25 2009 +0200 Switch to automatically generating the ChangeLog file Keep the old ChangeLog files as ChangeLog.old, and distribute them. Automatically genereate the ChangeLog from “git log”. And update the information for translators. diff --git a/.gitignore b/.gitignore index 0c0fc20..bb282f0 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ autom4te.cache/ build-tree/ config/ ABOUT-NLS +ChangeLog INSTALL configure config.* diff --git a/ChangeLog b/ChangeLog.old similarity index 100% rename from ChangeLog rename to ChangeLog.old diff --git a/Makefile.am b/Makefile.am index 72254cc..dc0bdd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,6 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 dist_pkgdata_DATA = cputable ostable triplettable EXTRA_DIST = \ + ChangeLog.old \ README.api \ README.feature-removal-schedule \ README.translators \ @@ -56,6 +57,11 @@ EXTRA_DIST = \ debian/shlibs.default \ debian/shlibs.override +.PHONY: ChangeLog + +ChangeLog: + git log -C --stat 1.15.0.. $@ + # If we create the dist tarball from the git repository, make sure # that we're not forgetting some files... dist-hook: diff --git a/README.translators b/README.translators index 69ccdf5..f54d9c7 100644 --- a/README.translators +++ b/README.translators @@ -1,35 +1,10 @@ Translators, when adding/updating your translation files, please follow the following rules: -* Update debian/changelog and one of po/ChangeLog, dselect/po/ChangeLog, - scripts/po/ChangeLog or man/po/ChangeLog: +* Update debian/changelog: - - Beware the you should NOT update the main ChangeLog file -for translation updates. Use the ChangeLog in the relevant -subdirectory instead. - - - The format of entries in the subdirectories' ChangeLog is strict: - -== -2006-02-11 Christian Perrier bubu...@debian.org - - * fr.po: Updated to 1011t. -== - -Note the date format AND the DOUBLE SPACE between the date and the -translator's email address. - -Note also the TAB character before the entry. NOT multiple spaces. - -Also note that the update should mention the file statistics as -XXXtYYYfZZZu. - -XXXt means XXX translated strings. -YYYf means YYY fuzzy strings strings. -ZZZu means ZZZ untranslated strings. -YYY or ZZZ may be omitted if they are null. - -This file contents MUST be encoded in UTF-8. + - Beware the you should NOT update the any of the legacy ChangeLog.old +files for translation updates. * Format of entries in debian/changelog: @@ -64,18 +39,25 @@ dpkg (1.13.15) unstable; urgency=low * Format of commit message - The formats above only apply to ChangeLog files and debian/changelog. + The formats above only apply to the debian/changelog file. They do not apply to the commit message. Following recommendations of http://wiki.debian.org/Teams/Dpkg/GitUsage you should start the commit message with a summary line, followed by an empty line and a a detailed/long description. For example: == -Updated german translation of manual pages +Update german translation of manual pages - * man/po/fr.po: Updated to 1354t. +Update to 1354t. == + Note that the update should mention the file statistics as XXXtYYYfZZZu. + + XXXt means XXX translated strings. + YYYf means YYY fuzzy strings strings. + ZZZu means ZZZ untranslated strings. + YYY or ZZZ may be omitted if they are null. + * Use of po/LINGUAS, dselect/po/LINGUAS or scripts/po/LINGUAS: When ADDING a new translation, don't forget adding the language to diff --git a/debian/rules b/debian/rules index a2cdbd8..3539cb3 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ binary-arch: install install -d debian/dpkg/sbin mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin - dh_installchangelogs -a ChangeLog + dh_installchangelogs -a ChangeLog ChangeLog.old dh_installdocs -a dh_link -a dh_lintian -a @@ -108,7 +108,7 @@ binary-indep: install dh_testroot -i dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm - dh_installchangelogs -i ChangeLog + dh_installchangelogs -i ChangeLog ChangeLog.old dh_installdocs -i dh_link -i dh_lintian -i diff --git a/dselect/po/ChangeLog b/dselect/po/ChangeLog.old similarity index 100% rename from dselect/po/ChangeLog rename to dselect/po/ChangeLog.old diff --git a/dselect/po/Makevars b/dselect/po/Makevars index db8f7d5..e5d0592 100644 --- a/dselect/po/Makevars +++ b/dselect/po/Makevars
[SCM] dpkg's main repository annotated tag, 1.15.0, created. 1.15.0
The annotated tag, 1.15.0 has been created at 05c34f36560fe95916f7fdb985bb6791a2d04037 (tag) tagging 9f3fb231f12f2a3394c2f2b63aedd685cd8627c9 (commit) replaces 1.14.25 tagged by Guillem Jover on Mon Mar 2 07:05:26 2009 +0200 - Shortlog Release 1.15.0 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.9 (GNU/Linux) iEYEABECAAYFAkmraRYACgkQuW9ciZ2SjJv1pQCggENeQLw5Kurj1z7FADbNKkue hpIAoI44namYLPNwX97CLQHpEA/EMEGU =c5Hv -END PGP SIGNATURE- Changwoo Ryu (1): Updated Korean translation Chris Coulson (1): s-s-d: Support setting the IO scheduler class and priority Christian Perrier (1): Updated Slovak translation Colin Watson (3): libdpkg: Fix typo in comment Add a few more comment around obscure bits of trigger handling code dpkg: Change dir to / after chroot when using --instdir Daniel Hahler (1): dpkg-deb: improve error message unable to extract Eddy Petrișor (1): forward-ported the Romanian translation from the lenny branch Egmont Koblinger (1): dpkg: Properly lstat the correct file when using --root on upgrades Frank Lichtenheld (2): Fix error in the German translation for dpkg-gencontrol.1 scripts/de.po: Fix a typo Guillem Jover (198): Bump version to 1.15.0~ u-a: Do not suggest manually changing the symlinks on verbose mode libdpkg: Add new rtrim_slash_slashdot private function Refactor subprocess signal setup Use sizeof_array() instead of ad-hoc calculations Mark and coalesce similar strings for translation dpkg-gencontrol: Rename $package_type to $pkg_type for uniformity Add ChangeLog entry for bd40cd8d18f3751420e402f3e3c4fb5ebf20c72c Add '.be' to the default dpkg-source -i regex and -I pattern Fix link order when using libcompat.a and libintl.a dpkg-trigger: Remove duplicate program name from badusage output Use sizeof_array instead of ad-hoc calculation Coalesce similar badusage() strings for translation Revert dpkg-query: strip trailing slashes in parameters after -S or --search libdpkg: Make rtrim_slash_slashdot return the string size dpkg-query: Trim trailing slash and slash dot from arguments dpkg-query: Use strpbrk instead of strcspn and strlen libdpkg: Use size_t intead of int for the index to fix a warning libdpkg: Use memset instead of ad-hoc operation libdpkg: Remove sentinel from catch_signals array dpkg: Fix memory leaks on --set-selections dpkg: Fix the support for passing more than one --status-fd option libdpkg: Switch log from a pointer to struct varbuf to just struct varbuf dpkg: Fix memory leaks if archivefiles is called more than once Use new VARBUF_INIT macro instead of varbufinit to initialize variables libdpkg: Add a size argument to varbufinit Replace realloc plus error checking usage with m_realloc Fix weird space in bracketed name making dch not work properly Close --status-fd file descriptors on exec dpkg-query: Use VARBUF_INIT to initialize path instead of vb dpkg-source: Add '.hgignore' to the default -i regex and -I pattern libdpkg: Make varbufprintf use varbufvprintf instead of reimplementing it libdpkg: Call va_end when done with the va_list variable from va_copy dpkg-divert: Support diverting files from and to different file systems dpkg-divert: Do not silently enable --rename on --remove libdpkg: Do not segfault on varbufdupc after extending the buffer Fix localized strings dpkg-query: Remove trailing newlines from badusage output libdpkg: Make badusage use ohshit instead of its own error handling libdpkg: Make checksubprocerr less deep and a bit more readable libdpkg: Move onerr_abort definition from mlib.c to ehandle.c libdpkg: Move skip_slash_dotslash from parsehelp.c to path.c man/po: Regenerate .pot file and merge .po files with it libdpkg: Remove unused file argument from parseerr and parsemustfield libdpkg: Refactor string format escaping libdpkg: Split some parse functions into error and warning variants Wrap changelog lines at 78 characters libdpkg: Define YY_NO_INPUT to make flex not include input() dselect: Fix compilation warnings libdpkg: Constify strings members for package db structs libdpkg: Remove unneeded 'const char *' cast Remove RCS tag Switch to use UTF-8 copyright symbol and add missing ones dpkg: Do not allocate memory when lstat fails while upgrading dpkg: Use the debug function instead of reimplementing its logic Use '$(CPP)' instead of '$(CC) -E' in Makefile.am target libdpkg: Include needed header files Make tarfile_skip_one_forward static Remove wrong comment not matching the code Use NULL instead of 0 libdpkg
[SCM] dpkg's main repository branch, master, updated. 1.14.25-294-g1a0b8ad
The following commit has been merged in the master branch:
commit 5324c97681508ef8a74f12f25d7b3aea40a21eec
Author: Guillem Jover guil...@debian.org
Date: Mon Mar 2 05:23:13 2009 +0200
u-a: Do not use non-ASCII strings on C locale
The C locale is supposed to only get ASCII strings, for non-ASCII
strings there are things like the en_US or en_GB locales.
diff --git a/ChangeLog b/ChangeLog
index d50f975..3d3b8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-03-02 Guillem Jover guil...@debian.org
+ * scripts/update-alternatives.pl: Do not use non-ASCII strings on C
+ locale.
+ (version): Likewise.
+
+2009-03-02 Guillem Jover guil...@debian.org
+
* po/POTFILES.in: Remove reference to cleanup-info.pl.
* scripts/.gitignore: Likewise.
diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl
index 4dcb3f4..6447804 100755
--- a/scripts/update-alternatives.pl
+++ b/scripts/update-alternatives.pl
@@ -159,7 +159,7 @@ if ($action eq install) {
$file) unless $file =~ m|^/|;
error(_g(alternative path %s doesn't exist.), $file)
unless -e $file;
-error(_g(alternative name (%s) must not contain “/” and spaces.), $name)
+error(_g(alternative name (%s) must not contain '/' and spaces.), $name)
if $name =~ m|[/\s]|;
foreach my $slave ($inst_alt-slaves()) {
$link = $inst_alt-slave_link($slave);
@@ -179,7 +179,7 @@ if ($action eq install) {
$link) unless $link =~ m|^/|;
error(_g(alternative path is not absolute as it should be: %s),
$file) unless $file =~ m|^/|;
-error(_g(alternative name (%s) must not contain “/” and spaces.),
$slave)
+error(_g(alternative name (%s) must not contain '/' and spaces.),
$slave)
if $slave =~ m|[/\s]|;
}
}
@@ -401,9 +401,9 @@ sub version {
printf _g(Debian %s version %s.\n), $progname, $version;
printf _g(
-Copyright © 1995 Ian Jackson.
-Copyright © 2000-2002 Wichert Akkerman.
-Copyright © 2009 Raphaël Hertzog.);
+Copyright (C) 1995 Ian Jackson.
+Copyright (C) 2000-2002 Wichert Akkerman.
+Copyright (C) 2009 Raphael Hertzog.);
printf _g(
This is free software; see the GNU General Public Licence version 2 or
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-7-gb53a6a7
The following commit has been merged in the master branch:
commit b53a6a7e6651e82eeb8cfafa1981b1c5d33b4e04
Author: Guillem Jover guil...@debian.org
Date: Wed Feb 11 03:31:24 2009 +0200
Add new pkg_array_free function
Use it to free the arrays after use, so that we do not leak.
diff --git a/src/pkg-array.c b/src/pkg-array.c
index d5504a0..9599a3b 100644
--- a/src/pkg-array.c
+++ b/src/pkg-array.c
@@ -66,3 +66,11 @@ pkg_array_sort(struct pkg_array *a, pkg_sorter_func
*pkg_sort)
qsort(a-pkgs, a-n_pkgs, sizeof(a-pkgs[0]), pkg_sort);
}
+void
+pkg_array_free(struct pkg_array *a)
+{
+ a-n_pkgs = 0;
+ free(a-pkgs);
+ a-pkgs = NULL;
+}
+
diff --git a/src/pkg-array.h b/src/pkg-array.h
index b8d336f..f783458 100644
--- a/src/pkg-array.h
+++ b/src/pkg-array.h
@@ -35,6 +35,7 @@ struct pkg_array {
void pkg_array_init_from_db(struct pkg_array *a);
void pkg_array_sort(struct pkg_array *a, pkg_sorter_func *pkg_sort);
+void pkg_array_free(struct pkg_array *a);
DPKG_END_DECLS
diff --git a/src/query.c b/src/query.c
index 579bd6f..c42f688 100644
--- a/src/query.c
+++ b/src/query.c
@@ -181,6 +181,8 @@ void listpackages(const char *const *argv) {
if (ferror(stdout)) werr(stdout);
if (ferror(stderr)) werr(stderr);
+
+ pkg_array_free(array);
modstatdb_shutdown();
}
@@ -427,6 +429,8 @@ void showpackages(const char *const *argv) {
if (ferror(stdout)) werr(stdout);
if (ferror(stderr)) werr(stderr);
+
+ pkg_array_free(array);
freeformat(fmt);
modstatdb_shutdown();
}
diff --git a/src/select.c b/src/select.c
index 426e07f..2a2f2a7 100644
--- a/src/select.c
+++ b/src/select.c
@@ -78,6 +78,8 @@ void getselections(const char *const *argv) {
}
if (ferror(stdout)) werr(stdout);
if (ferror(stderr)) werr(stderr);
+
+ pkg_array_free(array);
}
void setselections(const char *const *argv) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-27-gea2fc2f
The following commit has been merged in the master branch: commit 2c43c07e599d2f26ef7cebf5f9adaaa4bb9c279f Author: Guillem Jover guil...@debian.org Date: Wed Mar 11 02:51:33 2009 +0200 u-a: Fix typo in man page (‘values’ → ‘value’) Introduced in commit 7277e7e87af9cf4313880f228c693aa78ad46a03. Reported-by: Helge Kreutzmann deb...@helgefjell.de diff --git a/man/update-alternatives.8 b/man/update-alternatives.8 index 71320af..d7e3258 100644 --- a/man/update-alternatives.8 +++ b/man/update-alternatives.8 @@ -390,7 +390,7 @@ there is no alternatives available. .TP .BR Value: currently selected alternative The path of the currently selected alternative. It can also take the magic -values \fBnone\fR. It is used if the link doesn't exist. +value \fBnone\fR. It is used if the link doesn't exist. .TP .TP The other blocks describe the available alternatives in the queried link group: -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-90-g51926ee
The following commit has been merged in the master branch: commit f8ff44b68dbec2457bd3dbe0e9c891f73534f7b2 Author: Guillem Jover guil...@debian.org Date: Mon Apr 13 04:42:53 2009 +0200 Add avr32 to cputable Closes: #523456 diff --git a/cputable b/cputable index a8474ef..b852059 100644 --- a/cputable +++ b/cputable @@ -20,6 +20,7 @@ alpha alpha alpha.* amd64 x86_64 x86_64 armeb armeb arm.*b armarm arm.* +avr32 avr32 avr32 hppa hppahppa.* m32r m32rm32r m68k m68km68k diff --git a/debian/changelog b/debian/changelog index 9db5e0d..bce89c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Sync archtable with architectures currently present in Debian sid. - Remove m68k. - Add kfreebsd-i386 and kfreebsd-amd64. + * Add avr32 to cputable. Closes: #523456 [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-90-g51926ee
The following commit has been merged in the master branch: commit e2d3483c9d297823e8917196925a00927d5d1afe Author: Guillem Jover guil...@debian.org Date: Mon Apr 13 04:38:20 2009 +0200 Sync archtable with architectures currently present in Debian sid Remove m68k. Add kfreebsd-i386 and kfreebsd-amd64. diff --git a/debian/archtable b/debian/archtable index 2f1a11b..a50328b 100644 --- a/debian/archtable +++ b/debian/archtable @@ -19,10 +19,11 @@ x86_64-linux-gnuamd64 arm-linux-gnu arm arm-linux-gnueabi armel hppa-linux-gnu hppa -m68k-linux-gnu m68k mips-linux-gnu mips mipsel-linux-gnu mipsel powerpc-linux-gnu powerpc s390-linux-gnu s390 sparc-linux-gnusparc i486-gnu hurd-i386 +i486-kfreebsd-gnu kfreebsd-i386 +x86_64-kfreebsd-gnukfreebsd-amd64 diff --git a/debian/changelog b/debian/changelog index f2fac7b..9db5e0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,9 @@ dpkg (1.15.1) UNRELEASED; urgency=low [ Guillem Jover ] * Fix typo in dpkg output (‘unexecpted’ → ‘unexpected’). Closes: #519082 Thanks to Ivan Masár. + * Sync archtable with architectures currently present in Debian sid. +- Remove m68k. +- Add kfreebsd-i386 and kfreebsd-amd64. [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-102-g0e8fe98
The following commit has been merged in the master branch: commit 0e8fe98658d63a07a1449cee61f16a67136134e6 Author: Philipp Kern pk...@debian.org Date: Sat May 2 11:26:25 2009 +0200 Fix format string in German translation Signed-off-by: Philipp Kern pk...@debian.org diff --git a/scripts/po/de.po b/scripts/po/de.po index ea998cc..c50381c 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -2258,8 +2258,8 @@ msgstr warte auf %s #, perl-format msgid %s didn't complete in %d second msgid_plural %s didn't complete in %d seconds -msgstr[0] %s beendete sich nicht innerhalb von %s Sekunden -msgstr[1] %s beendeten sich nicht innerhalb von %s Sekunden +msgstr[0] %s beendete sich nicht innerhalb von %d Sekunden +msgstr[1] %s beendeten sich nicht innerhalb von %d Sekunden #: scripts/Dpkg/Shlibs/Objdump.pm:83 msgid cannot fork for objdump -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-103-g3624a4b
The following commit has been merged in the master branch:
commit 3624a4b0eb5499f367c1d8077240f151903cd70a
Author: Philipp Kern pk...@debian.org
Date: Sat May 2 11:39:00 2009 +0200
dpkg-source: do not set arch:any in dsc on arch-restricted packages
dpkg-source was pretty liberal in setting 'Architecture: any' in the
dsc: as soon as there are two binary packages, one being arch:all and
one being arch-restricted, you get arch:any in the dsc. This is
incorrect because the package will only build on the autobuilders
if there are architecture-dependent binary packages available.
Thus this patch only produces arch:any if at least one binary package
specifies it. Otherwise it outputs the set of all binary architectures
(including arch:all).
Closes: #526617
Signed-off-by: Philipp Kern pk...@debian.org
diff --git a/debian/changelog b/debian/changelog
index 1fc1546..1c88a38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -72,6 +72,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
- Add kfreebsd-i386 and kfreebsd-amd64.
* Add avr32 to cputable. Closes: #523456
* Detect the curses headers to use instead of hardcoding them.
+ * Make dpkg-source do not set arch:any in .dsc on arch-restricted packages.
+Thanks to Philipp Kern pk...@debian.org. Closes: #526617
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 75482d0..6ea264c 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -195,31 +195,23 @@ if ($options{'opmode'} eq 'build') {
foreach $_ (keys %{$pkg}) {
my $v = $pkg-{$_};
if (m/^Architecture$/) {
- if (debarch_eq($v, 'any')) {
-@sourcearch= ('any');
- } elsif (debarch_eq($v, 'all')) {
-if (!...@sourcearch || $sourcearch[0] eq 'all') {
-@sourcearch= ('all');
-} else {
-@sourcearch= ('any');
-}
+# Gather all binary architectures in one set. 'any' and 'all'
+# are special-cased as they need to be the only ones in the
+# current stanza if present.
+if (debarch_eq($v, 'any') || debarch_eq($v, 'all')) {
+push(@sourcearch, $v) unless $archadded{$v}++;
} else {
- if (@sourcearch grep($sourcearch[0] eq $_, 'any',
'all')) {
- @sourcearch= ('any');
- } else {
- for my $a (split(/\s+/, $v)) {
- error(_g(`%s' is not a legal architecture string),
- $a)
- unless $a =~ /^[\w-]+$/;
- error(_g(architecture %s only allowed on its .
-own (list for package %s is `%s')),
- $a, $p, $a)
- if grep($a eq $_, 'any','all');
-push(@sourcearch,$a) unless $archadded{$a}++;
-}
-}
+for my $a (split(/\s+/, $v)) {
+error(_g(`%s' is not a legal architecture string),
+ $a)
+unless $a =~ /^[\w-]+$/;
+error(_g(architecture %s only allowed on its .
+ own (list for package %s is `%s')),
+ $a, $p, $a)
+if grep($a eq $_, 'any', 'all');
+push(@sourcearch, $a) unless $archadded{$a}++;
+}
}
-$fields-{'Architecture'}= join(' ',@sourcearch);
} elsif (s/^X[BC]*S[BC]*-//i) { # Include XS-* fields
$fields-{$_} = $v;
} elsif (m/^$control_pkg_field_regex$/ ||
@@ -229,6 +221,11 @@ if ($options{'opmode'} eq 'build') {
}
}
}
+if (grep($_ eq 'any', @sourcearch)) {
+# If we encounter one 'any' then the other arches become insignificant.
+@sourcearch = ('any');
+}
+$fields-{'Architecture'} = join(' ', @sourcearch);
# Scan fields of dpkg-parsechangelog
foreach $_ (keys %{$changelog}) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-105-gda05382
The following commit has been merged in the master branch:
commit da0538290b7dbbfb3c537441470767fd0879c985
Author: Guillem Jover guil...@debian.org
Date: Sun May 3 14:07:00 2009 +0200
Add '.hgtags' to the default dpkg-source -i regex and -I pattern
Closes: #525854
diff --git a/debian/changelog b/debian/changelog
index ea9597e..624d26c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
* Detect the curses headers to use instead of hardcoding them.
* Make dpkg-source do not set arch:any in .dsc on arch-restricted packages.
Thanks to Philipp Kern pk...@debian.org. Closes: #526617
+ * Add '.hgtags' to the default dpkg-source -i regex and -I pattern.
+Closes: #525854
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index d29294b..64f7fb4 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -48,7 +48,7 @@ our $diff_ignore_default_regexp = '
# File-names that should be ignored (never directories)
(?:^|/)(?:DEADJOE|\.arch-inventory|\.(?:bzr|cvs|hg|git)ignore)$|
# File or directory names that should be ignored
-(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg|_darcs|\.git|
+(?:^|/)(?:CVS|RCS|\.deps|\{arch\}|\.arch-ids|\.svn|\.hg(?:tags)?|_darcs|\.git|
\.shelf|_MTN|\.be|\.bzr(?:\.backup|tags)?)(?:$|/.*$)
';
# Take out comments and newlines
@@ -77,6 +77,7 @@ our @tar_ignore_default_pattern = qw(
.gitignore
.hg
.hgignore
+.hgtags
.shelf
.svn
CVS
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-111-g780d969
The following commit has been merged in the master branch: commit d61abe87252a6a6b234c8eb59a8926c8f9887d32 Author: Guillem Jover guil...@debian.org Date: Tue May 5 15:20:21 2009 +0200 Enable Esperanto and Asturian languages Missed in commits ce04415c6b809e4936f9b69d5ea60daa06f0657d and 8ab2d4a31934027a1824f8ba6458e8de175ccdb5. diff --git a/po/LINGUAS b/po/LINGUAS index a400728..01f0938 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -4,6 +4,9 @@ # the current maintainer's name in their preferred form and contact # e-mail address. +# Asturian - Marcos Alvarez Costales marcos.alvarez.costa...@gmail.com +ast + # Bosnian - Safir Šećerović sapph...@linux.org.ba bs @@ -25,6 +28,9 @@ dz # Greek (Hellenic) - George Papamichelakis geo...@step.gr el +# Esperanto - Felipe Castro fef...@gmail.com +eo + # Spanish - Javier Fernández-Sanguino Peña j...@debian.org es -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-111-g780d969
The following commit has been merged in the master branch: commit 6f165c4579b53597583305394cd4e1cb377d5fa8 Author: Guillem Jover guil...@debian.org Date: Tue May 5 15:21:45 2009 +0200 Changelog police: Esperanto is a new language diff --git a/debian/changelog b/debian/changelog index 6053ecb..f3b0328 100644 --- a/debian/changelog +++ b/debian/changelog @@ -100,13 +100,13 @@ dpkg (1.15.1) UNRELEASED; urgency=low [ Added dpkg translations ] * Asturian (Marcos Alvarez Costales). Closes: #519478, #519813, #519998 + * Esperanto (Felipe Castro). Closes: #523023 [ Updated dpkg translations ] * French (Christian Perrier). * German (Sven Joachim). * Slovak (Ivan Masár). Closes: #519084 * Swedish (Peter Krefting). - * Esperanto (Felipe Castro). Closes: #523023 * Russian (Yuri Kozlov). Closes: #526659 [ Updated man page translations ] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-111-g780d969
The following commit has been merged in the master branch: commit 618b6cd27b04c50e3e5b21b035b45aef58e6affb Author: Guillem Jover guil...@debian.org Date: Tue May 5 15:39:46 2009 +0200 Declare the ChangeLog file to be removed on distclean This fixes ‘make distcheck’. diff --git a/Makefile.am b/Makefile.am index e864b03..926ce21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,6 +57,7 @@ EXTRA_DIST = \ debian/shlibs.override .PHONY: ChangeLog +DISTCLEANFILES = ChangeLog ChangeLog: git log -C --stat 1.15.0.. $@ -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-120-g170fd06
The following commit has been merged in the master branch:
commit 2b125e6ed96d88e0f352eba9bfc746a9640dc01a
Author: Guillem Jover guil...@debian.org
Date: Sun May 10 17:54:05 2009 +0200
Do not set the Arch substvar in dpkg-source
Avoid setting the variable by default as it is expensive, and not
really needed for dpkg-source anyway. Split the setting into a new
member set_arch_substvars().
Regression introduced in 120ecd5161f4cf468d611b3dea05ac8a43313a75.
Closes: #526132
diff --git a/debian/changelog b/debian/changelog
index 7b2b707..abddbe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
have been disabled from configure.
* Move Debian specific keyrings to the Debian vendor class and change the
Ubuntu vendor class to inherit from it.
+ * Do not set the Arch substvar in dpkg-source, avoiding generating warnings
+when there's no compiler present. Closes: #526132
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 9cf0f33..136612e 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -45,8 +45,8 @@ strings.
=item my $s = Dpkg::Substvars-new($file)
Create a new object that can do substitutions. By default it contains
-generic substitutions like ${Newline}, ${Space}, ${Tab}, ${dpkg:Version},
-${dpkg:Upstream-Version} and ${Arch}.
+generic substitutions like ${Newline}, ${Space}, ${Tab}, ${dpkg:Version}
+and ${dpkg:Upstream-Version}.
Additional substitutions will be read from the $file passed as parameter.
@@ -60,7 +60,6 @@ sub new {
Tab = \t,
dpkg:Version = $version,
dpkg:Upstream-Version = $version,
- Arch = get_host_arch(),
};
$self-{'dpkg:Upstream-Version'} =~ s/-[^-]+$//;
bless $self, $class;
@@ -143,6 +142,18 @@ sub set_version_substvars {
$self-{'Source-Version'} = $version;
}
+=item $s-set_arch_substvars()
+
+Defines architecture variables: ${Arch}.
+
+=cut
+
+sub set_arch_substvars {
+my ($self) = @_;
+
+$self-{'Arch'} = get_host_arch();
+}
+
=item $newstring = $s-substvars($string)
Substitutes variables in $string and return the result in $newstring.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index d407614..32b5bff 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -206,6 +206,7 @@ $bad_parser = 1 if ($@);
my $control = Dpkg::Control-new($controlfile);
my $fields = Dpkg::Fields::Object-new();
$substvars-set_version_substvars($changelog-{Version});
+$substvars-set_arch_substvars();
$substvars-parse($varlistfile) if -e $varlistfile;
if (defined($prev_changelog) and
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 50b1f87..da4c2d4 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -126,6 +126,7 @@ my %options = (file = $changelogfile);
$options{changelogformat} = $changelogformat if $changelogformat;
my $changelog = parse_changelog(%options);
$substvars-set_version_substvars($changelog-{Version});
+$substvars-set_arch_substvars();
$substvars-parse($varlistfile) if -e $varlistfile;
$substvars-set(binary:Version, $forceversion) if defined $forceversion;
my $control = Dpkg::Control-new($controlfile);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-120-g170fd06
The following commit has been merged in the master branch:
commit 4a0c79171400847ea97ebd66384fde21f497964c
Author: Guillem Jover guil...@debian.org
Date: Sun May 10 18:33:09 2009 +0200
Fix POD errors detected by podchecker in perl modules
Add missing blank lines after =cut, close =over section with =back and
add a FIXME comment to an empty section.
diff --git a/scripts/Dpkg/Cdata.pm b/scripts/Dpkg/Cdata.pm
index a8294bd..48b7099 100644
--- a/scripts/Dpkg/Cdata.pm
+++ b/scripts/Dpkg/Cdata.pm
@@ -52,6 +52,7 @@ The return value is a reference to a tied hash
(Dpkg::Fields::Object) that
can be used to access the various fields.
=cut
+
sub parsecdata {
my ($input, $file, %options) = @_;
@@ -121,4 +122,5 @@ sub parsecdata {
=back
=cut
+
1;
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 5a91632..ee2a9fc 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -24,7 +24,7 @@ Dpkg::Changelog
=head1 DESCRIPTION
-to be written
+FIXME: to be written
=head2 Functions
@@ -722,6 +722,7 @@ as --key. If the value of the corresponding hash entry
is defined, then
it's passed as the parameter that follows.
=cut
+
sub parse_changelog {
my (%options) = @_;
my @parserpath = (/usr/local/lib/dpkg/parsechangelog,
@@ -821,6 +822,8 @@ Dpkg::Changelog::Entry - represents one entry in a Debian
changelog
=head1 SYNOPSIS
+FIXME: to be written
+
=head1 DESCRIPTION
=cut
diff --git a/scripts/Dpkg/Control.pm b/scripts/Dpkg/Control.pm
index 6e4ab85..0dfacca 100644
--- a/scripts/Dpkg/Control.pm
+++ b/scripts/Dpkg/Control.pm
@@ -42,6 +42,7 @@ Create a new Dpkg::Control object for $file. If $file is
omitted, it parses
debian/control. If file is -, it parses the standard input.
=cut
+
sub new {
my ($this, $arg) = @_;
my $class = ref($this) || $this;
@@ -67,6 +68,7 @@ sub new {
Resets what got read.
=cut
+
sub reset {
my $self = shift;
$self-{source} = undef;
@@ -78,6 +80,7 @@ sub reset {
Parse the content of $file. Exits in case of errors.
=cut
+
sub parse {
my ($self, $file) = @_;
open(CDATA, , $file) || syserr(_g(cannot read %s), $file);
@@ -93,6 +96,7 @@ or a description of where the data comes from. It's used in
error
messages.
=cut
+
sub parse_fh {
my ($self, $fh, $desc) = @_;
$self-reset();
@@ -118,6 +122,7 @@ Returns a reference to a hash containing the fields
concerning the
source package. The hash is tied to Dpkg::Fields::Object.
=cut
+
sub get_source {
my $self = shift;
return $self-{source};
@@ -130,6 +135,7 @@ package numbered $idx (starting at 1). The hash is tied to
Dpkg::Fields::Object.
=cut
+
sub get_pkg_by_idx {
my ($self, $idx) = @_;
return $self-{packages}[--$idx];
@@ -141,6 +147,7 @@ Returns a reference to a hash containing the fields
concerning the binary
package named $name. The hash is tied to Dpkg::Fields::Object.
=cut
+
sub get_pkg_by_name {
my ($self, $name) = @_;
foreach my $pkg (@{$self-{packages}}) {
@@ -155,6 +162,7 @@ sub get_pkg_by_name {
Returns a list containing the hashes for all binary packages.
=cut
+
sub get_packages {
my $self = shift;
return @{$self-{packages}};
@@ -165,6 +173,7 @@ sub get_packages {
Dump the content into a filehandle.
=cut
+
sub dump {
my ($self, $fh) = @_;
tied(%{$self-{source}})-dump($fh);
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 540ffca..89a1e10 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -116,6 +116,7 @@ The arguments can also be undef in case there's no explicit
architecture
restriction.
=cut
+
sub arch_is_superset {
my ($p, $q) = @_;
my $p_arch_neg = defined($p) $p-[0] =~ /^!/;
@@ -186,6 +187,7 @@ dependency. It returns 0 if the p dependency implies that
q is
not satisfied. It returns undef when there's no implication.
=cut
+
sub version_implies {
my ($rel_p, $v_p, $rel_q, $v_q) = @_;
@@ -296,6 +298,7 @@ this when parsing non-dependency fields like Conflicts (see
=back
=cut
+
sub parse {
my $dep_line = shift;
my %options = (@_);
@@ -357,6 +360,7 @@ dumping.
=back
=cut
+
sub compare {
my ($a, $b) = @_;
return -1 if $a-is_empty();
@@ -785,6 +789,7 @@ Add a new dependency object at the end of the list.
=back
=cut
+
use strict;
use warnings;
@@ -1113,6 +1118,7 @@ packages provided (by the set of installed packages).
Create a new object.
=cut
+
use strict;
use warnings;
@@ -1131,6 +1137,7 @@ undefined we know that the package is installed but we
don't know which
version it is.
=cut
+
sub add_installed_package {
my ($self, $pkg, $ver) = @_;
$self-{pkg}{$pkg} = $ver;
@@ -1143,6 +1150,7 @@ and $version correspond to the associated relation given
in the Provides
field. This might be used in the future for versioned provides.
=cut
+
sub add_provided_package {
my ($self, $pkg, $rel, $ver
[SCM] dpkg's main repository branch, master, updated. 1.15.0-120-g170fd06
The following commit has been merged in the master branch: commit 1b075bd34bf8c2362b0999b29ec5c2ab88429db9 Author: Guillem Jover guil...@debian.org Date: Sun May 10 19:07:06 2009 +0200 s-s-d: Print valid values for IO scheduler class in --help output diff --git a/debian/changelog b/debian/changelog index bd99c4c..bab0be0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -93,6 +93,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Preserve faulting errno when printing reason in start-stop-daemon fatal function. * Only print fatal errno string in start-stop-daemon if it was non-zero. + * Print the valid values for the IO scheduler class in start-stop-daemon +--help output. [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 70ff9e4..47f6af3 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -391,6 +391,9 @@ do_help(void) The process scheduler policy can be one of:\n other, fifo or rr\n \n +The IO scheduler class can be one of:\n + real-time, best-effort or idle\n +\n Exit status: 0 = done 1 = nothing done (= 0 if --oknodo)\n 3 = trouble 2 = with --retry, processes wouldn't die\n); } -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-120-g170fd06
The following commit has been merged in the master branch:
commit 289c179ef6d91ad4daec4abff7762d5b17a010c9
Author: Guillem Jover guil...@debian.org
Date: Sun May 10 19:53:08 2009 +0200
dpkg-vendor: Use usageerr instead of non-existent badusage
diff --git a/scripts/dpkg-vendor.pl b/scripts/dpkg-vendor.pl
index d4c6d29..f010e6e 100755
--- a/scripts/dpkg-vendor.pl
+++ b/scripts/dpkg-vendor.pl
@@ -63,7 +63,7 @@ while (@ARGV) {
if (m/^--vendor$/) {
$vendor = shift(@ARGV);
} elsif (m/^--(is|derives-from|query)$/) {
-badusage(_g(two commands specified: --%s and --%s), $1, $action)
+usageerr(_g(two commands specified: --%s and --%s), $1, $action)
if defined($action);
$action = $1;
$param = shift(@ARGV);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-129-gedb5b75
The following commit has been merged in the master branch:
commit 4b8061f8583220089eda1611fb7c55efd0cb41b5
Author: Guillem Jover guil...@debian.org
Date: Tue May 12 16:24:58 2009 +0200
Remove obsolete --largemem and --smallmem dpkg options
diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 9f8c39d..e40a860 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -38,11 +38,6 @@ Status: obsolete
When: lenny+1
Warning: program
-What: --largemem, --smallmem (dpkg option)
-Status: obsolete
-When: lenny+1
-Warning: program
-
What: --no-auto-select (dpkg option)
Status: deprecated
When: lenny+1
@@ -103,4 +98,9 @@ Why:
This program was needed long time ago to fixup broken info dir files
generated by buggy install-info programs. Should not be needed anymore.
+What: --largemem, --smallmem (dpkg option)
+Status: removed
+When: 1.15.1
+Why:
+ These options have been no-ops for a long time.
diff --git a/debian/changelog b/debian/changelog
index 41e5fff..95e87b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -106,6 +106,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
--help output.
* Print a warning when using obsolete '--print-installation-architecture'.
Closes: #528171
+ * Remove obsolete --largemem and --smallmem dpkg options.
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/src/main.c b/src/main.c
index 9dc4adb..385d179 100644
--- a/src/main.c
+++ b/src/main.c
@@ -447,8 +447,6 @@ static const struct cmdinfo cmdinfos[]= {
{ no-also-select,'N', 0, f_alsoselect, NULL, NULL,0 },
{ skip-same-version, 'E', 0, f_skipsame, NULL, NULL,1 },
{ auto-deconfigure, 'B', 0, f_autodeconf, NULL, NULL,1 },
- OBSOLETE( largemem, 0 ),
- OBSOLETE( smallmem, 0 ),
{ root, 0, 1, NULL, NULL, setroot, 0 },
{ abort-after, 0, 1, errabort, NULL, setinteger,0 },
{ admindir, 0, 1, NULL, admindir, NULL, 0 },
diff --git a/src/main.h b/src/main.h
index 036696c..c45a8ee 100644
--- a/src/main.h
+++ b/src/main.h
@@ -86,7 +86,7 @@ extern const char *const statusstrings[];
extern const struct cmdinfo *cipaction;
extern int f_pending, f_recursive, f_alsoselect, f_skipsame, f_noact;
-extern int f_autodeconf, f_largemem, f_nodebsig;
+extern int f_autodeconf, f_nodebsig;
extern int f_triggers;
extern unsigned long f_debug;
extern int fc_downgrade, fc_configureany, fc_hold, fc_removereinstreq,
fc_overwrite;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-129-gedb5b75
The following commit has been merged in the master branch:
commit edb5b7598366738eb4d3b48ddff2dcef9cda4c54
Author: Guillem Jover guil...@debian.org
Date: Thu May 14 07:49:59 2009 +0200
Remove obsolete 822-date program
It has long been superseeded by ‘date -R’.
diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 6b2293c..76d8365 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -1,13 +1,6 @@
This is a list of features that are scheduled to be removed from dpkg.
-What: 822-date (program)
-Status: obsolete
-When: lenny+1
-Warning: program
-Why:
- Should switch to use 'date -R'.
-
What: Source-Version (substvar)
Status: obsolete
When: lenny+1
@@ -100,3 +93,9 @@ Why:
These priorities have been superseded by either other fields or values in
other fields.
+What: 822-date (program)
+Status: removed
+When: 1.15.1
+Why:
+ Should switch to use 'date -R'.
+
diff --git a/debian/changelog b/debian/changelog
index ce952b7..5855a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
* Remove obsolete --largemem and --smallmem dpkg options.
* Remove obsolete --force-auto-select dpkg option.
* Remove obsolete priorities support from dpkg.
+ * Remove obsolete 822-date program.
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/debian/dpkg-dev.install b/debian/dpkg-dev.install
index 628468d..1e2c639 100644
--- a/debian/dpkg-dev.install
+++ b/debian/dpkg-dev.install
@@ -1,7 +1,6 @@
../shlibs.default etc/dpkg
../shlibs.override etc/dpkg
-usr/bin/822-date
usr/bin/dpkg-architecture
usr/bin/dpkg-buildpackage
usr/bin/dpkg-checkbuilddeps
@@ -18,7 +17,6 @@ usr/bin/dpkg-source
usr/bin/dpkg-vendor
usr/lib/dpkg/parsechangelog
usr/share/locale/*/LC_MESSAGES/dpkg-dev.mo
-usr/share/man/{*/*,*}/822-date.1
usr/share/man/{*/*,*}/deb-control.5
usr/share/man/{*/*,*}/deb-version.5
usr/share/man/{*/*,*}/deb-substvars.5
diff --git a/debian/usertags b/debian/usertags
index 8e26281..ef4ff74 100644
--- a/debian/usertags
+++ b/debian/usertags
@@ -82,7 +82,6 @@ libdpkg-perl Dpkg perl
modules.
cleanup-info [CLEANUP-INFO]
install-info [INSTALL-INFO]
-822-date [822-DATE]
dpkg-dev Those should be reassigned to
the dpkg-dev package.
@@ -120,7 +119,6 @@ usercategory dpkg-program
+ Dpkg perl modules [tag=libdpkg-perl]
+ start-stop-daemon [tag=s-s-d]
+ update-alternatives [tag=u-a]
- + 822-date [tag=822-date]
+ cleanup-info [tag=cleanup-info]
+ install-info [tag=install-info]
+ dselect [package=dselect]
diff --git a/man/822-date.1 b/man/822-date.1
deleted file mode 100644
index afe9251..000
--- a/man/822-date.1
+++ /dev/null
@@ -1,40 +0,0 @@
-.\ Hey, Emacs! This is an -*- nroff -*- source file.
-.TH 822\-date 1 2007-01-24 Debian Project dpkg utilities
-.SH NAME
-822\-date \- Print date and time in RFC2822 format
-.
-.SH SYNOPSIS
-.B 822\-date
-.
-.SH DESCRIPTION
-.B 822\-date
-displays the current date and time in the format described in RFC2822.
-It does so by simply calling
-.BR date (1)
-with the \fB\-R\fP option.
-.PP
-.B Using 822\-date is deprecated since
-.BR date (1)
-provides the same functionality when called with the \fB\-R\fP.
-.
-.SH OPTIONS
-.B 822\-date
-does not take any arguments or options.
-.
-.SH BUGS
-This facility really ought to be part of
-.BR date (1).
-.
-.SH SEE ALSO
-.I Internet Message Format
-(RFC2822),
-.BR date (1).
-.
-.SH AUTHOR
-.B 822\-date
-is a really simple wrapper around
-.BR date (1).
-By its simplicity, the code is probably not copyrightable and
-should be considered to be in the public domain. This man page
-was written by Frank Lichtenheld based on an earlier version
-by Ian Jackson and was also put in the public domain.
diff --git a/man/Makefile.am b/man/Makefile.am
index 6c582dc..592b6d8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -71,7 +71,6 @@ dist-hook: man.stamp
done
dist_man_MANS = \
- 822-date.1 \
deb-control.5 \
deb-version.5 \
deb-shlibs.5 \
diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg
index 0e6524f..598cd82 100644
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@ -13,11 +13,6 @@
opt_ru:-L koi8-r -A koi8-r \
opt_sv:-L ISO-8859-1
-[type:man] $(srcdir)/822-date.1 \
- $lang:$lang/822-date.1 \
- add_$lang:$(srcdir)/po/$lang.add
-
-
[type:man] $(srcdir)/deb.5 \
$lang:$lang/deb.5\
add_$lang:$(srcdir)/po/$lang.add
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0889294..0511562 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -16,5 +16,4 @@ dpkg-statoverride
[SCM] dpkg's main repository branch, master, updated. 1.15.0-141-ga4d87d5
The following commit has been merged in the master branch: commit 3582817fd91ceab77cdd25d14ea2add1abe0be61 Author: Guillem Jover guil...@debian.org Date: Tue May 19 07:13:35 2009 +0200 Do not right justify the database reading progress percent counter There's an odd space most for most of the progress, which will never be actually seen filled by the 100%. Seems slightly better to just not indent it. diff --git a/debian/changelog b/debian/changelog index 7ef67c6..2e9d1d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -124,6 +124,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Remove obsolete --force-auto-select dpkg option. * Remove obsolete priorities support from dpkg. * Remove obsolete 822-date program. + * Do not right justify the database reading progress percent counter. [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/lib/progress.c b/lib/progress.c index 65b11e9..0e81e67 100644 --- a/lib/progress.c +++ b/lib/progress.c @@ -61,7 +61,7 @@ progress_step(struct progress *progress) progress-last_percent = cur_percent; - printf(\r%s%3d%%, progress-text, cur_percent); + printf(\r%s%d%%, progress-text, cur_percent); } void -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-141-ga4d87d5
The following commit has been merged in the master branch:
commit 655872184c55febb2299eb6a19aa4d0612d2da60
Author: Guillem Jover guil...@debian.org
Date: Tue May 19 07:39:08 2009 +0200
Remove deprecated status for substvars in dpkg-source and dpkg-genchanges
Even if there's no use at all for substvars or they are (currently)
undesirable making the source not easily reproducible for Debian and
most derivatives using the same build processesor, it might be
interesting for uses like templated source package generation and
similar, or other interesting ideas we might not have thought about.
Also the same logic we applied for the removal of the substvar support
could be applied to most of the “Build options” as well, as those do not
make sense in the normal build for official packages (like -U, or -D).
Changed the code to stop producing warnings, and remove deprecated notes
from man page.
diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 76d8365..61f9bcf 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -25,15 +25,6 @@ Warning: none
Why:
This option has been superseded by -tudeb.
-What: substvars support in dpkg-source and dpkg-genchanges
-Status: deprecated
-When: lenny+1
-Warning: program
-Why:
- substvars do not make sense during generation of .dsc and .changes files.
- This also means that it won't be possible anymore to override the Format
- field output by dpkg-genchanges.
-
What: support of custom changelog parsers understanding only -v
Status: obsolete
When: lenny+1
diff --git a/debian/changelog b/debian/changelog
index 2e9d1d7..263a623 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,6 +125,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low
* Remove obsolete priorities support from dpkg.
* Remove obsolete 822-date program.
* Do not right justify the database reading progress percent counter.
+ * Remove deprecated status on substvars for dpkg-source dpkg-genchanges,
+and stop producing warnings.
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index aab42ad..ecbd3e1 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -96,11 +96,11 @@ multiple times, they are tried in order. It does
override any format given in \fBdebian/source/format\fP.
.TP
.BI \-V name = value
-\fBDeprecated\fP. Set an output substitution variable.
+Set an output substitution variable.
See \fBdeb\-substvars\fP(5) for a discussion of output substitution.
.TP
.BI \-T substvarsfile
-\fBDeprecated\fP. Read substitution variables in
+Read substitution variables in
.IR substvarsfile ;
the default is to not read any file.
.TP
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index f3af7a4..ce5cc1a 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -162,7 +162,6 @@ while (@ARGV) {
$since= $POSTMATCH;
} elsif (m/^-T/) {
$varlistfile= $POSTMATCH;
- warning(_g(substvars support is deprecated (see
README.feature-removal-schedule)));
} elsif (m/^-m/) {
$forcemaint= $POSTMATCH;
} elsif (m/^-e/) {
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6ea264c..1b4f225 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -103,10 +103,8 @@ while (@ARGV $ARGV[0] =~ m/^-/) {
$options{'require_valid_signature'} = 1;
} elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:]/) {
$substvars-set($1, $POSTMATCH);
-warning(_g(substvars support is deprecated (see
README.feature-removal-schedule)));
} elsif (m/^-T/) {
$varlistfile = $POSTMATCH;
-warning(_g(substvars support is deprecated (see
README.feature-removal-schedule)));
} elsif (m/^-(h|-help)$/) {
usage();
exit(0);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-141-ga4d87d5
The following commit has been merged in the master branch:
commit bf8ae12d0ec3710f409f7b2a533f496a15347da7
Author: Guillem Jover guil...@debian.org
Date: Tue May 19 07:49:15 2009 +0200
Make deprecated dpkg-scanpackages --udeb option produce a warning
Callers should use -tudeb instead.
diff --git a/README.feature-removal-schedule b/README.feature-removal-schedule
index 61f9bcf..54ec7a7 100644
--- a/README.feature-removal-schedule
+++ b/README.feature-removal-schedule
@@ -21,7 +21,7 @@ Why:
What: -u, --udeb (dpkg-scanpackages option)
Status: deprecated
When: lenny+1
-Warning: none
+Warning: program
Why:
This option has been superseded by -tudeb.
diff --git a/debian/changelog b/debian/changelog
index 263a623..542ceda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low
* Do not right justify the database reading progress percent counter.
* Remove deprecated status on substvars for dpkg-source dpkg-genchanges,
and stop producing warnings.
+ * Make deprecated dpkg-scanpackages --udeb option produce a warning.
[ Frank Lichtenheld ]
* Dpkg::Version: Remove unnecessary function next_elem which just
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 0528442..10eeb7f 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -38,7 +38,7 @@ use Getopt::Long qw(:config bundling);
my %options = (help= sub { usage(); exit 0; },
version = \version,
type= undef,
- udeb= 0,
+ udeb= \set_type_udeb,
arch= undef,
multiversion= 0,
);
@@ -66,6 +66,12 @@ Options:
), $progname;
}
+sub set_type_udeb()
+{
+warning(_g(-u, --udeb option is deprecated (see
README.feature-removal-schedule)));
+$options{type} = 'udeb';
+}
+
sub load_override
{
my $override = shift;
@@ -115,8 +121,7 @@ if (not @ARGV = 1 @ARGV = 3) {
usageerr(_g(1 to 3 args expected));
}
-my $type = defined($options{type}) ? $options{type} :
-$options{udeb} ? 'udeb' : 'deb';
+my $type = defined($options{type}) ? $options{type} : 'deb';
my $arch = $options{arch};
my @find_args;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.0-141-ga4d87d5
The following commit has been merged in the master branch: commit a4d87d52a10f7726934bc8d1a607dc28721a7a4d Author: Guillem Jover guil...@debian.org Date: Tue May 19 07:56:01 2009 +0200 dpkg-source: Do not state in --help there is a default substvar file diff --git a/debian/changelog b/debian/changelog index 542ceda..8a9d13a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -128,6 +128,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Remove deprecated status on substvars for dpkg-source dpkg-genchanges, and stop producing warnings. * Make deprecated dpkg-scanpackages --udeb option produce a warning. + * Change dpkg-source --help output to state there's no default substvar +file to match reality. [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 1b4f225..232caa7 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -372,7 +372,7 @@ Build options: -lchangelogfileget per-version info from this file. -Fchangelogformat force change log format. -Vname=value set a substitution variable. - -Tvarlistfile read variables here, not debian/substvars. + -Tvarlistfile read variables here. -Dfield=valueoverride or add a .dsc field and value. -Ufieldremove a field. -q quiet mode. -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-1-g0ea0cb5
The following commit has been merged in the master branch:
commit 3bbdfa787d98084a682a404921e8bed6b5be8442
Author: Guillem Jover guil...@debian.org
Date: Thu May 21 06:00:41 2009 +0200
s-s-d: Add new warning function
Switch a previous ad-hoc warning message to use the new warning
function, which additionally properly prints to stderr.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 47f6af3..b34d171 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -220,6 +220,17 @@ static void badusage(const char *msg)
NONRETURNING;
static void
+warning(const char *format, ...)
+{
+ va_list arglist;
+
+ fprintf(stderr, %s: warning: , progname);
+ va_start(arglist, format);
+ vfprintf(stderr, format, arglist);
+ va_end(arglist);
+}
+
+static void
fatal(const char *format, ...)
{
va_list arglist;
@@ -1249,8 +1260,8 @@ do_stop(int signal_nr, int quietmode, int *n_killed, int
*n_notkilled, int retry
(*n_killed)++;
} else {
if (signal_nr)
- printf(%s: warning: failed to kill %d: %s\n,
- progname, p-pid, strerror(errno));
+ warning(failed to kill %d: %s\n,
+ p-pid, strerror(errno));
(*n_notkilled)++;
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-1-g0ea0cb5
The following commit has been merged in the master branch: commit bfda32490d1ff730322636c97a4ce4d65bbd69c5 Author: Guillem Jover guil...@debian.org Date: Thu May 21 06:02:17 2009 +0200 s-s-d: Warn if --name argument is longer than supported by kernel Most kernels have a length limit on the process name stored in-kernel. For now the checks done on Linux compatible procfs might hit this limit and be unable to properly track the correct process. So warn in that case and recommend switching to the more reliable --exec. Closes: #353015, #519128 diff --git a/debian/changelog b/debian/changelog index 94506f6..c0782c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -133,6 +133,8 @@ dpkg (1.15.1) UNRELEASED; urgency=low * Make deprecated dpkg-scanpackages --udeb option produce a warning. * Change dpkg-source --help output to state there's no default substvar file to match reality. + * Warn in start-stop-daemon if the argument to --name is longer than the +supported kernel process name size. Closes: #353015, #519128 [ Frank Lichtenheld ] * Dpkg::Version: Remove unnecessary function next_elem which just diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index b34d171..9f87ed3 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -115,6 +115,11 @@ #include sys/syscall.h #endif +#if defined(OSLinux) +/* This comes from TASK_COMM_LEN defined in linux's include/linux/sched.h. */ +#define PROCESS_NAME_SIZE 15 +#endif + #if defined(SYS_ioprio_set) defined(linux) #define HAVE_IOPRIO_SET #endif @@ -842,6 +847,13 @@ parse_options(int argc, char * const *argv) if (!execname !pidfile !userspec !cmdname) badusage(need at least one of --exec, --pidfile, --user or --name); +#ifdef PROCESS_NAME_SIZE + if (cmdname strlen(cmdname) PROCESS_NAME_SIZE) + warning(this system is not able to track process names\n + longer than %d characters, please use --exec + instead of --name.\n, PROCESS_NAME_SIZE); +#endif + if (!startas) startas = execname; -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-1-g0ea0cb5
The following commit has been merged in the master branch:
commit adaf5c43dc21083aa89341dd78a573dcc1e12be5
Author: Guillem Jover guil...@debian.org
Date: Thu May 21 06:12:12 2009 +0200
Revert dpkg-deb: don't warn on unknown fields starting with X-
This reverts commit 66835c07b3eb5c6a5a1374e60e93dfaf12538323.
Conflicts:
debian/changelog
diff --git a/debian/changelog b/debian/changelog
index c0782c0..617f465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,9 +45,6 @@ dpkg (1.15.1) UNRELEASED; urgency=low
Thanks to Bill Allombert for the patch.
* dpkg now correctly refuses empty parameters when an integer value is
wanted. Closes: #386197 Based on a patch by Bill Allombert.
- * dpkg-deb doesn't warn anymore when it encounters unknown DEBIAN/control
-fields starting with X-. Closes: #353040
-Thanks to Nils Rennebarth for the patch.
* Fix a mistake in the french translation of dpkg's manual page.
Thanks to Jonathan Gibert. Closes: #522032
* Fix dpkg-source to not die when uncompressor processes are killed by
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index a6faa4e..f5bcc70 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -73,9 +73,6 @@ static const char *arbitrary_fields[] = {
static int known_arbitrary_field(const struct arbitraryfield *field) {
const char **known;
- /* always accept fields starting with x- */
- if (strncasecmp(field-name, x-, 2) == 0)
-return 1;
for (known= arbitrary_fields; *known; known++)
if (strcasecmp(field-name, *known) == 0)
return 1;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-1-g0ea0cb5
The following commit has been merged in the master branch: commit 588381c24ec54f97ad980618778df19ac86ffc10 Author: Guillem Jover guil...@debian.org Date: Thu May 21 06:53:44 2009 +0200 Release 1.15.1 diff --git a/configure.ac b/configure.ac index 719843c..57e2161 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.1~], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.1], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index 8c7feb1..c7b5af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dpkg (1.15.1) UNRELEASED; urgency=low +dpkg (1.15.1) unstable; urgency=low [ Raphael Hertzog ] * Fix dpkg-genchanges to not include the additional upstream tarballs @@ -168,7 +168,7 @@ dpkg (1.15.1) UNRELEASED; urgency=low * German (Helge Kreutzmann). * Swedish (Peter Krefting). - -- Frank Lichtenheld dj...@debian.org Sun, 29 Mar 2009 13:14:30 +0200 + -- Guillem Jover guil...@debian.org Thu, 21 May 2009 06:45:45 +0200 dpkg (1.15.0) experimental; urgency=low -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-1-g0ea0cb5
The following commit has been merged in the master branch: commit 0ea0cb5405b828afb1ffdd39e0ef96e562aba86f Author: Guillem Jover guil...@debian.org Date: Thu May 21 07:02:42 2009 +0200 Bump version to 1.15.2~ diff --git a/configure.ac b/configure.ac index 57e2161..d2f86ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.1], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.2~], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index c7b5af0..34676b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dpkg (1.15.2) UNRELEASED; urgency=low + + * + + -- Guillem Jover guil...@debian.org Thu, 21 May 2009 07:01:35 +0200 + dpkg (1.15.1) unstable; urgency=low [ Raphael Hertzog ] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-3-ge2e4129
The following commit has been merged in the master branch:
commit 2251827c000ba901d0027194f6d9281184ede701
Author: Guillem Jover guil...@debian.org
Date: Fri May 22 04:44:22 2009 +0200
s-s-d: Use the same exact name for all Hurd OS macros
Use the properly capitalized version of the macro. This fixes a FTBFS
on GNU/Hurd due to a missmatched define usage.
Regression introduced in fc860a55b26aee3d774ed010c43822491852bbc2.
diff --git a/debian/changelog b/debian/changelog
index 34676b6..9bf12c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
dpkg (1.15.2) UNRELEASED; urgency=low
- *
+ * Fix FTBFS on GNU/Hurd due to a missmatched define usage in
+start-stop-daemon.
-- Guillem Jover guil...@debian.org Thu, 21 May 2009 07:01:35 +0200
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 9f87ed3..49e1630 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -27,7 +27,7 @@
#if defined(linux) || (defined(__FreeBSD_kernel__) defined(__GLIBC__))
# define OSLinux
#elif defined(__GNU__)
-# define OSHURD
+# define OSHurd
#elif defined(__sun)
# define OSsunos
#elif defined(OPENBSD) || defined(__OpenBSD__)
@@ -44,7 +44,7 @@
#define MIN_POLL_INTERVAL 2 /* µs */
-#if defined(OSHURD)
+#if defined(OSHurd)
#include hurd.h
#include ps.h
#endif
@@ -168,7 +168,7 @@ static int umask_value = -1;
#define IO_SCHED_PRIO_MAX 7
static struct stat exec_stat;
-#if defined(OSHURD)
+#if defined(OSHurd)
static struct proc_stat_list *procset = NULL;
#endif
@@ -868,7 +868,7 @@ parse_options(int argc, char * const *argv)
}
-#if defined(OSHURD)
+#if defined(OSHurd)
static void
init_procset(void)
{
@@ -978,7 +978,7 @@ pid_is_user(pid_t pid, uid_t uid)
return 0;
return (sb.st_uid == uid);
}
-#elif defined(OSHURD)
+#elif defined(OSHurd)
static int
pid_is_user(pid_t pid, uid_t uid)
{
@@ -1110,13 +1110,13 @@ pid_is_cmd(pid_t pid, const char *name)
}
#endif
-#if defined(OSHURD)
+#if defined(OSHurd)
static int
pid_is_running(pid_t pid)
{
return get_proc_stat(pid, 0) != NULL;
}
-#else /* !OSHURD */
+#else /* !OSHurd */
static int
pid_is_running(pid_t pid)
{
@@ -1138,7 +1138,7 @@ check(pid_t pid)
#elif defined(HAVE_KVM_H)
if (execname !pid_is_exec(pid, execname))
return;
-#elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD)
+#elif defined(OSHurd) || defined(OSFreeBSD) || defined(OSNetBSD)
/* Let's try this to see if it works */
if (execname !pid_is_cmd(pid, execname))
return;
@@ -1196,7 +1196,7 @@ do_procinit(void)
if (!foundany)
fatal(nothing in /proc - not mounted?);
}
-#elif defined(OSHURD)
+#elif defined(OSHurd)
static int
check_proc_stat(struct proc_stat *ps)
{
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-3-ge2e4129
The following commit has been merged in the master branch:
commit e2e412977aefafa7df6f84c8cb6fe645dae85215
Author: Sven Joachim svenj...@gmx.de
Date: Fri May 22 05:04:00 2009 +0200
dselect: Remove obsolete priorities support
dselect shows wrong package priorities in the package selection screen.
This is because the string representations arrays haven't been updated
to reflect the removal of the “Recommended” and “Contrib” priorities
in commit c8d3938be127e256fd593f234858fb9d474b2353.
diff --git a/debian/changelog b/debian/changelog
index 9bf12c7..3050cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dpkg (1.15.2) UNRELEASED; urgency=low
* Fix FTBFS on GNU/Hurd due to a missmatched define usage in
start-stop-daemon.
+ * Remove obsolete priorities support from dselect.
+Thanks to Sven Joachim svenj...@gmx.de.
-- Guillem Jover guil...@debian.org Thu, 21 May 2009 07:01:35 +0200
diff --git a/dselect/pkgdisplay.cc b/dselect/pkgdisplay.cc
index c767043..2832d41 100644
--- a/dselect/pkgdisplay.cc
+++ b/dselect/pkgdisplay.cc
@@ -62,10 +62,8 @@ const char
*const prioritystrings[]= { N_(Required),
N_(Important),
N_(Standard),
- N_(Recommended),
N_(Optional),
N_(Extra),
- N_(Contrib),
N_(!Bug!),
N_(Unclassified),
0 },
@@ -84,10 +82,8 @@ const char
*const priorityabbrevs[]= { N_(Req),
N_(Imp),
N_(Std),
- N_(Rec),
N_(Opt),
N_(Xtr),
- N_(Ctb),
N_(bUG),
N_(?) };
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-17-g328b98f
The following commit has been merged in the master branch:
commit 885726e7585b081eca172df9cda2a57134564922
Author: Guillem Jover guil...@debian.org
Date: Sun May 24 21:13:26 2009 +0200
dselect: Refactor partition printing in disk setup method
Move code into its own function.
diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup
index be3b565..1da9b9d 100755
--- a/dselect/methods/disk/setup
+++ b/dselect/methods/disk/setup
@@ -41,6 +41,13 @@ yesno () {
done
}
+print_partition_table()
+{
+ device=$1
+
+ echo -e p\nq\n | fdisk $device 2/dev/null
+}
+
getblockdev () {
mountpoint=$vardir/methods/mnt
if [ -z $defaultdevice ]
@@ -72,7 +79,7 @@ getblockdev () {
then
blockbase=`echo \$tryblockdevice\ | sed -e
's/[0-9]\{1,\}$//'`
set +e
- echo -e p\nq\n | fdisk $blockbase 2/dev/null $tp.f
+ print_partition_table $blockbase $tp.f
set -e
proposeddevice=$tryblockdevice perl -ne '
next unless /^ *Device +Boot +Begin +Start +End +Blocks +Id +System *$/i ..
!/\S/;
@@ -285,10 +292,10 @@ fi
if [ $option = harddisk ]
then
set +e
- echo -e 'p\nq\n' | fdisk /dev/hda 2/dev/null $tp.f
+ print_partition_table /dev/hda $tp.f
if [ $? != 0 ]
then
- echo -e 'p\nq\n' | fdisk /dev/sda 2/dev/null $tp.f
+ print_partition_table /dev/sda $tp.f
fi
set -e
perl -ne '
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-17-g328b98f
The following commit has been merged in the master branch:
commit 328b98fff19dbafcb90008a0711672ded9c71401
Author: Guillem Jover guil...@debian.org
Date: Sun May 24 21:18:30 2009 +0200
dselect: Fix bashism (“echo -e”) in disk setup method
Closes: #530071
diff --git a/debian/changelog b/debian/changelog
index c81373c..998cabb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dpkg (1.15.2) UNRELEASED; urgency=low
start-stop-daemon.
* Remove obsolete priorities support from dselect.
Thanks to Sven Joachim svenj...@gmx.de.
+ * Fix bashism (“echo -e”) in dselect disk setup method. Closes: #530071
[ Updated dpkg translations ]
* Asturian (Marcos Alvarez Costales). Closes: #529889
diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup
index 1da9b9d..572a35c 100755
--- a/dselect/methods/disk/setup
+++ b/dselect/methods/disk/setup
@@ -45,7 +45,7 @@ print_partition_table()
{
device=$1
- echo -e p\nq\n | fdisk $device 2/dev/null
+ printf p\nq\n | fdisk $device 2/dev/null
}
getblockdev () {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.1-18-g5ccdc88
The following commit has been merged in the master branch:
commit 5ccdc88f40ec8bea792874b97596cda8368aff4d
Author: Guillem Jover guil...@debian.org
Date: Sun May 24 22:08:58 2009 +0200
dselect: Properly parse fdisk output in disk setup method
util-linux's fdisk has not emitted the Begin column since 1998-06-10
version 2.8. Change the parsing code accordingly to make it actually
work.
diff --git a/debian/changelog b/debian/changelog
index 998cabb..81d3056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
dpkg (1.15.2) UNRELEASED; urgency=low
+ [ Guillem Jover ]
* Fix FTBFS on GNU/Hurd due to a missmatched define usage in
start-stop-daemon.
* Remove obsolete priorities support from dselect.
Thanks to Sven Joachim svenj...@gmx.de.
* Fix bashism (“echo -e”) in dselect disk setup method. Closes: #530071
+ * Properly parse fdisk output in dselect disk setup method.
[ Updated dpkg translations ]
* Asturian (Marcos Alvarez Costales). Closes: #529889
diff --git a/dselect/methods/disk/setup b/dselect/methods/disk/setup
index 572a35c..8f52d16 100755
--- a/dselect/methods/disk/setup
+++ b/dselect/methods/disk/setup
@@ -82,9 +82,9 @@ getblockdev () {
print_partition_table $blockbase $tp.f
set -e
proposeddevice=$tryblockdevice perl -ne '
-next unless /^ *Device +Boot +Begin +Start +End +Blocks +Id +System *$/i ..
!/\S/;
+next unless /^ *Device +Boot +Start +End +Blocks +Id +System *$/i .. !/\S/;
next unless s:^/\S+:: $ eq $ENV{proposeddevice};
-next unless s/^ +(\* +)?\d+ +\d+ +\d+ +\d+\+? +//;
+next unless s/^ +(\* +)?\d+ +\d+ +\d+\+? +//;
next unless m/^([0-9a-f]{1,2}) /i;
%types= ( 1,msdos, 4,msdos, 6,msdos, 7,hpfs, 80,minix,
81,minix, 83,ext2 );
@@ -299,7 +299,7 @@ then
fi
set -e
perl -ne '
-next unless /^ *Device +Boot +Begin +Start +End +Blocks +Id +System *$/i ..
!/\S/;
+next unless /^ *Device +Boot +Start +End +Blocks +Id +System *$/i .. !/\S/;
next unless / [146] +DOS \d+-bit \S+$/;
next unless m:^/\S+:;
print $; ' $tp.f $tp.d
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-1-g1f97537
The following commit has been merged in the master branch:
commit fa9b6e6133cdb9e1519efef3929c2d6eb2b73a4c
Author: Guillem Jover guil...@debian.org
Date: Mon May 25 07:55:14 2009 +0200
s-s-d: Refactor process schedule priority range checks
Move into a new function, so we avoid warnings due to unused variables.
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 49e1630..261b6e6 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -507,10 +507,26 @@ parse_umask(const char *string, int *value_r)
}
static void
+validate_proc_schedule(void)
+{
+#ifdef _POSIX_PRIORITY_SCHEDULING
+ int prio_min, prio_max;
+
+ prio_min = sched_get_priority_min(proc_sched-policy);
+ prio_max = sched_get_priority_max(proc_sched-policy);
+
+ if (proc_sched-priority prio_min)
+ badusage(process scheduler priority less than min);
+ if (proc_sched-priority prio_max)
+ badusage(process scheduler priority greater than max);
+#endif
+}
+
+static void
parse_proc_schedule(const char *string)
{
char *policy_str, *prio_str;
- int prio = 0, prio_min, prio_max;
+ int prio = 0;
policy_str = xstrdup(string);
policy_str = strtok(policy_str, :);
@@ -534,15 +550,7 @@ parse_proc_schedule(const char *string)
} else
badusage(invalid process scheduler policy);
-#ifdef _POSIX_PRIORITY_SCHEDULING
- prio_min = sched_get_priority_min(proc_sched-policy);
- prio_max = sched_get_priority_max(proc_sched-policy);
-
- if (proc_sched-priority prio_min)
- badusage(process scheduler priority less than min);
- if (proc_sched-priority prio_max)
- badusage(process scheduler priority greater than max);
-#endif
+ validate_proc_schedule();
}
static void
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-1-g1f97537
The following commit has been merged in the master branch: commit f4ab87b29a4abfe372395d66679d526e888d3559 Author: Guillem Jover guil...@debian.org Date: Tue May 26 01:02:00 2009 +0200 Release 1.15.2 diff --git a/configure.ac b/configure.ac index d2f86ca..04bd93e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.2~], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.2], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index f096d73..4ead9e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -dpkg (1.15.2) UNRELEASED; urgency=low +dpkg (1.15.2) unstable; urgency=low [ Guillem Jover ] * Fix FTBFS on GNU/Hurd due to a missmatched define usage in -start-stop-daemon. +start-stop-daemon. Closes: #530446 * Remove obsolete priorities support from dselect. Thanks to Sven Joachim svenj...@gmx.de. * Fix bashism (“echo -e”) in dselect disk setup method. Closes: #530071 @@ -24,8 +24,8 @@ dpkg (1.15.2) UNRELEASED; urgency=low [ Updated scripts translations ] * French (Christian Perrier). * German (Helge Kreutzmann). - - -- Guillem Jover guil...@debian.org Thu, 21 May 2009 07:01:35 +0200 + + -- Guillem Jover guil...@debian.org Tue, 26 May 2009 01:00:36 +0200 dpkg (1.15.1) unstable; urgency=low -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-1-g1f97537
The following commit has been merged in the master branch: commit 1f975373036a3f9e2cd441d205d307e25f639311 Author: Guillem Jover guil...@debian.org Date: Tue May 26 01:26:44 2009 +0200 Bump version to 1.15.3~ diff --git a/configure.ac b/configure.ac index 04bd93e..19beea1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([dpkg], [1.15.2], [debian-d...@lists.debian.org]) +AC_INIT([dpkg], [1.15.3~], [debian-d...@lists.debian.org]) AC_CONFIG_SRCDIR([lib/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) diff --git a/debian/changelog b/debian/changelog index 4ead9e3..2b59d74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dpkg (1.15.3) UNRELEASED; urgency=low + + * + + -- Guillem Jover guil...@debian.org Tue, 26 May 2009 01:26:04 +0200 + dpkg (1.15.2) unstable; urgency=low [ Guillem Jover ] -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-2-g24f7107
The following commit has been merged in the master branch: commit 24f7107e9815e90931fbccd1299757494431dd75 Author: Guillem Jover guil...@debian.org Date: Thu May 28 14:33:53 2009 +0200 Unset TAR_OPTIONS when extracting .deb archives We don't want the extraction to be affected by user settable environment variables either. The command line tool is considered an interface for which we want as much control as possible to guarantee no unintentional behaviour changes to the format or they way it's being handled. Closes: #530860 diff --git a/debian/changelog b/debian/changelog index 2b59d74..b8d3a44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ dpkg (1.15.3) UNRELEASED; urgency=low - * + * Unset TAR_OPTIONS when extracting .deb archives. Closes: #530860 -- Guillem Jover guil...@debian.org Tue, 26 May 2009 01:26:04 +0200 diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c index d7be0de..5cc6660 100644 --- a/dpkg-deb/extract.c +++ b/dpkg-deb/extract.c @@ -312,6 +312,9 @@ void extracthalf(const char *debar, const char *directory, strcat(buffer, f); m_dup2(p2[0],0); close(p2[0]); + + unsetenv(TAR_OPTIONS); + execlp(TAR, tar, buffer, -, NULL); ohshite(_(failed to exec tar)); } -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit 8e3f26ad2d330da7269e77a097b8eefb3f148e02
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 21:41:24 2009 +0200
dpkg-scanpackages: Properly detect spurious overrides
The detection was being done too late as no overriden information is
kept if the packages is not on the archive.
diff --git a/debian/changelog b/debian/changelog
index 6526f56..f377ec0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
[ Guillem Jover ]
* Unset TAR_OPTIONS when extracting .deb archives. Closes: #530860
* Use default compressor values in dpkg-source from Dpkg::Source::Compressor.
+ * Fix dpkg-scanpackages to properly detect spurious overrides.
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index d2189d5..dadf5bd 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -14,6 +14,7 @@ use Dpkg::Version qw(compare_versions);
textdomain(dpkg-dev);
my (@samemaint, @changedmaint);
+my @spuriousover;
my %packages;
my %overridden;
@@ -85,7 +86,10 @@ sub load_override
my ($p, $priority, $section, $maintainer) = split(/\s+/, $_, 4);
- next unless defined($packages{$p});
+ if (not defined($packages{$p})) {
+ push(@spuriousover, $p);
+ next;
+ }
for my $package (@{$packages{$p}}) {
if ($maintainer) {
@@ -268,8 +272,6 @@ for my $p (sort keys %packages) {
}
close(STDOUT) or syserr(_g(Couldn't close stdout));
-my @spuriousover= grep(!defined($packages{$_}),sort keys %overridden);
-
writelist(_g(** Packages in archive but missing from override file: **),
@missingover);
if (@changedmaint) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit f2d0f89f806829b39629e01016a774f25ef93a01
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 21:43:28 2009 +0200
dpkg-scanpackages: Fix spurious overrides output
Split each package name and indent to the right.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index dadf5bd..1f626c2 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -288,8 +288,8 @@ if (@samemaint) {
}
if (@spuriousover) {
print(STDERR
- _g( -- Packages in override file but not in archive: --).\n,
- @spuriousover,
+ _g( -- Packages in override file but not in archive: --). \n ,
+ join(' ', @spuriousover),
\n) || die $!;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit 7df211874ca2223d8d3e6554ad611ad6ac26e530
Author: Guillem Jover guil...@debian.org
Date: Mon Jun 15 01:18:02 2009 +0200
dpkg-scanpackages: Move missing override warning near the spurious one
They are related so better to have them closer.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index fc9d86e..7aa5345 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -256,10 +256,6 @@ for my $p (sort keys %packages) {
}
close(STDOUT) or syserr(_g(Couldn't close stdout));
-if (@missingover) {
-warning(_g(Packages in archive but missing from override file:));
-warning( %s, join(' ', @missingover));
-}
if (@changedmaint) {
warning(_g(Packages in override file with incorrect old maintainer
value:));
warning($_) foreach (@changedmaint);
@@ -268,6 +264,10 @@ if (@samemaint) {
warning(_g(Packages specifying same maintainer as override file:));
warning($_) foreach (@samemaint);
}
+if (@missingover) {
+warning(_g(Packages in archive but missing from override file:));
+warning( %s, join(' ', @missingover));
+}
if (@spuriousover) {
warning(_g(Packages in override file but not in archive:));
warning( %s, join(' ', @spuriousover));
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit d07ecdda8a1af8aeec8bba68fec5b25365e3ae5b
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 20:32:41 2009 +0200
Dpkg::ErrorHandling: Support changing the file handle for info()
Sometimes we need not clutter STDOUT when outputting data there.
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 6996692..cc6b8fe 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -9,6 +9,7 @@ our @EXPORT = qw(report_options info warning error errormsg
our @EXPORT_OK = qw(report unknown);
my $quiet_warnings = 0;
+my $info_fh = \*STDOUT;
sub report_options
{
@@ -17,6 +18,9 @@ sub report_options
if (exists $options{quiet_warnings}) {
$quiet_warnings = $options{quiet_warnings};
}
+if (exists $options{info_fh}) {
+$info_fh = $options{info_fh};
+}
}
sub report(@)
@@ -29,7 +33,7 @@ sub report(@)
sub info($;@)
{
-print report(_g(info), @_) if (!$quiet_warnings);
+print $info_fh report(_g(info), @_) if (!$quiet_warnings);
}
sub warning($;@)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit b299dad5ad3eb8bbcf75b0891f87744399e75574
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 19:57:05 2009 +0200
Dpkg::ErrorHandling: Add new report_options()
Set report options via this new function instead of directly exporting
private variables.
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 877663e..6996692 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -4,11 +4,20 @@ use Dpkg;
use Dpkg::Gettext;
use base qw(Exporter);
-our @EXPORT = qw(info warning error errormsg
+our @EXPORT = qw(report_options info warning error errormsg
syserr internerr subprocerr usageerr syntaxerr);
-our @EXPORT_OK = qw(report unknown $quiet_warnings);
+our @EXPORT_OK = qw(report unknown);
-our $quiet_warnings = 0;
+my $quiet_warnings = 0;
+
+sub report_options
+{
+my (%options) = @_;
+
+if (exists $options{quiet_warnings}) {
+$quiet_warnings = $options{quiet_warnings};
+}
+}
sub report(@)
{
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index b461a3a..03cf0b5 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -6,7 +6,7 @@ use warnings;
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown $quiet_warnings);
+use Dpkg::ErrorHandling qw(:DEFAULT unknown);
use Dpkg::Arch qw(debarch_eq);
use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
use Dpkg::Fields qw(:list capit);
@@ -115,7 +115,7 @@ while (@ARGV $ARGV[0] =~ m/^-/) {
# Deprecated option
warning(_g(-E and -W are deprecated, they are without effect));
} elsif (m/^-q$/) {
-$quiet_warnings = 1;
+report_options(quiet_warnings = 1);
$options{'quiet'} = 1;
} elsif (m/^--$/) {
last;
diff --git a/scripts/t/100_Dpkg_Version.t b/scripts/t/100_Dpkg_Version.t
index c98565f..5d3beed 100644
--- a/scripts/t/100_Dpkg_Version.t
+++ b/scripts/t/100_Dpkg_Version.t
@@ -1,13 +1,13 @@
# -*- mode: cperl;-*-
use Test::More;
-use Dpkg::ErrorHandling qw($quiet_warnings);
-
-$quiet_warnings = 1;
+use Dpkg::ErrorHandling;
use strict;
use warnings;
+report_options(quiet_warnings = 1);
+
my @tests = DATA;
my @ops = (, , lt,
=, le,
diff --git a/scripts/t/300_Dpkg_BuildOptions.t
b/scripts/t/300_Dpkg_BuildOptions.t
index dc43acd..ca1838d 100644
--- a/scripts/t/300_Dpkg_BuildOptions.t
+++ b/scripts/t/300_Dpkg_BuildOptions.t
@@ -1,6 +1,7 @@
# -*- mode: cperl;-*-
use Test::More tests = 6;
+use Dpkg::ErrorHandling;
use strict;
use warnings;
@@ -11,7 +12,7 @@ use_ok('Dpkg::BuildOptions');
no warnings;
# Disable warnings related to invalid values fed during
# the tests
-$Dpkg::ErrorHandling::quiet_warnings = 1;
+report_options(quiet_warnings = 1);
}
$ENV{DEB_BUILD_OPTIONS} = 'noopt foonostripbar parallel=3 bazNOCHECK';
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit 288aa90e881c1aaa8ddacdeeed8a5631142ffe67
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 19:02:55 2009 +0200
Dpkg::ErrorHandling: Remove unused warnerror() and $warnable_error
Do not pass over -W and -E from dpkg-buildpackage to dpkg-source anymore
and warn directly about its deprecated status.
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 968ced1..877663e 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -4,11 +4,10 @@ use Dpkg;
use Dpkg::Gettext;
use base qw(Exporter);
-our @EXPORT = qw(info warning warnerror error errormsg
+our @EXPORT = qw(info warning error errormsg
syserr internerr subprocerr usageerr syntaxerr);
-our @EXPORT_OK = qw(report unknown $warnable_error $quiet_warnings);
+our @EXPORT_OK = qw(report unknown $quiet_warnings);
-our $warnable_error = 1;
our $quiet_warnings = 0;
sub report(@)
@@ -29,15 +28,6 @@ sub warning($;@)
warn report(_g(warning), @_) if (!$quiet_warnings);
}
-sub warnerror(@)
-{
-if ($warnable_error) {
- warning(@_);
-} else {
- error(@_);
-}
-}
-
sub syserr($;@)
{
my $msg = shift;
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index ba751b3..bdab775 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -9,7 +9,7 @@ use POSIX;
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT $warnable_error);
+use Dpkg::ErrorHandling;
use Dpkg::BuildOptions;
use Dpkg::Compression;
use Dpkg::Version qw(check_version);
@@ -71,8 +71,6 @@ Options:
-ncdo not clean source tree (implies -b).
-tcclean source tree when finished.
-apadd pause before starting signature process.
- -E turn certain warnings into errors. } passed to
- -W when -E is turned on, -W turns it off. } dpkg-source
-i[regex]ignore diffs of files matching regex.} only passed
-I[pattern] filter out files when building tarballs. } to dpkg-source
--admindir=directory
@@ -186,12 +184,9 @@ while (@ARGV) {
$changedby = $1;
} elsif (/^-C(.*)$/) {
$desc = $1;
-} elsif (/^-W$/) {
- $warnable_error = 1;
- push @passopts, '-W';
-} elsif (/^-E$/) {
- $warnable_error = 0;
- push @passopts, '-E';
+} elsif (m/^-[EW]$/) {
+ # Deprecated option
+ warning(_g(-E and -W are deprecated, they are without effect));
} elsif (/^-R(.*)$/) {
@debian_rules = split /\s+/, $1;
} else {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit 1c18298e7510ffb2dab453293528ecd219d6a2b2
Author: Guillem Jover guil...@debian.org
Date: Sun Jun 14 20:34:22 2009 +0200
dpkg-scanpackages: Use info instead of ad-hoc printing
Redirect it to STDERR to not pollute STDOUT where the Packages file is
being outputted.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 7aa5345..207271f 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -13,6 +13,9 @@ use Dpkg::Version qw(compare_versions);
textdomain(dpkg-dev);
+# Do not pollute STDOUT with info messages
+report_options(info_fh = \*STDERR);
+
my (@samemaint, @changedmaint);
my @spuriousover;
my %packages;
@@ -273,4 +276,5 @@ if (@spuriousover) {
warning( %s, join(' ', @spuriousover));
}
-printf(STDERR _g( Wrote %s entries to output Packages file.).\n,
$records_written) || die $!;
+info(_g(Wrote %s entries to output Packages file.), $records_written);
+
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-20-g48a2039
The following commit has been merged in the master branch:
commit 48a20395d3406b655844057315868748dceada2d
Author: Guillem Jover guil...@debian.org
Date: Mon Jun 15 02:19:12 2009 +0200
dpkg-scanpackages: Mark string for translation
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 207271f..9c83356 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -102,7 +102,8 @@ sub load_override
my $debmaint = $$package{Maintainer};
if (!grep($debmaint eq $_, split(m:\s*//\s*:, $oldmaint))) {
push(@changedmaint,
- $p (package says $$package{Maintainer}, not
$oldmaint));
+sprintf(_g( %s (package says %s, not %s)),
+$p, $$package{Maintainer}, $oldmaint));
} else {
$$package{Maintainer} = $newmaint;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-25-g8e9df75
The following commit has been merged in the master branch:
commit 133bc9b2039b1804ff291aefd595ade7b8317741
Author: Guillem Jover guil...@debian.org
Date: Tue Jun 16 22:05:09 2009 +0200
Move statoverride db parsing into a new file
diff --git a/src/Makefile.am b/src/Makefile.am
index cb3ec93..19d864c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ dpkg_SOURCES = \
enquiry.c \
errors.c \
filesdb.c filesdb.h \
+ statdb.c \
help.c \
main.c main.h \
packages.c \
diff --git a/src/filesdb.c b/src/filesdb.c
index baee5f2..0529c67 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -50,7 +50,6 @@ static int allpackagesdone= 0;
static int nfiles= 0;
static struct diversion *diversions = NULL;
static FILE *diversionsfile = NULL;
-static FILE *statoverridefile = NULL;
void
ensure_package_clientdata(struct pkginfo *pkg)
@@ -334,132 +333,6 @@ void reversefilelist_abort(struct reversefilelistiter
*iterptr) {
while (reversefilelist_next(iterptr));
}
-void ensure_statoverrides(void) {
- static struct varbuf vb;
-
- struct stat stab1, stab2;
- FILE *file;
- char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
- struct filestatoverride *fso;
- struct filenamenode *fnn;
-
- varbufreset(vb);
- varbufaddstr(vb,admindir);
- varbufaddstr(vb,/ STATOVERRIDEFILE);
- varbufaddc(vb,0);
-
- onerr_abort++;
-
- file= fopen(vb.buf,r);
- if (!file) {
-if (errno != ENOENT) ohshite(_(failed to open statoverride file));
-if (!statoverridefile) { onerr_abort--; return; }
- } else {
-if (fstat(fileno(file),stab2))
- ohshite(_(failed to fstat statoverride file));
-if (statoverridefile) {
- if (fstat(fileno(statoverridefile),stab1))
- ohshite(_(failed to fstat previous statoverride file));
- if (stab1.st_dev == stab2.st_dev stab1.st_ino == stab2.st_ino) {
- fclose(file); onerr_abort--; return;
- }
-}
- }
- if (statoverridefile) fclose(statoverridefile);
- statoverridefile= file;
- setcloexec(fileno(statoverridefile), vb.buf);
-
- /* If the statoverride list is empty we don't need to bother reading it. */
- if (!stab2.st_size) {
-onerr_abort--;
-return;
- }
-
- loaded_list = nfmalloc(stab2.st_size);
- loaded_list_end = loaded_list + stab2.st_size;
-
- fd_buf_copy(fileno(file), loaded_list, stab2.st_size, _(statoverride file
`%.250s'), vb.buf);
-
- thisline = loaded_list;
- while (thislineloaded_list_end) {
-char* endptr;
-
-fso= nfmalloc(sizeof(struct filestatoverride));
-
-if (!(ptr = memchr(thisline, '\n', loaded_list_end - thisline)))
- ohshit(_(statoverride file is missing final newline));
-/* where to start next time around */
-nextline = ptr + 1;
-if (ptr == thisline)
- ohshit(_(statoverride file contains empty line));
-*ptr = 0;
-
-/* Extract the uid */
-if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_(syntax error in statoverride file));
-*ptr=0;
-if (thisline[0]=='#') {
- fso-uid=strtol(thisline + 1, endptr, 10);
- if (thisline + 1 == endptr || *endptr)
-ohshit(_(syntax error: invalid uid in statoverride file));
-} else {
- struct passwd* pw = getpwnam(thisline);
- if (pw==NULL)
-ohshit(_(syntax error: unknown user '%s' in statoverride file),
- thisline);
- fso-uid=pw-pw_uid;
-}
-
-/* Move to the next bit */
-thisline=ptr+1;
-if (thisline=loaded_list_end)
- ohshit(_(unexpected end of line in statoverride file));
-
-/* Extract the gid */
-if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_(syntax error in statoverride file));
-*ptr=0;
-if (thisline[0]=='#') {
- fso-gid=strtol(thisline + 1, endptr, 10);
- if (thisline + 1 == endptr || *endptr)
-ohshit(_(syntax error: invalid gid in statoverride file));
-} else {
- struct group* gr = getgrnam(thisline);
- if (gr==NULL)
-ohshit(_(syntax error: unknown group '%s' in statoverride file),
- thisline);
- fso-gid=gr-gr_gid;
-}
-
-/* Move to the next bit */
-thisline=ptr+1;
-if (thisline=loaded_list_end)
- ohshit(_(unexpected end of line in statoverride file));
-
-/* Extract the mode */
-if (!(ptr=memchr(thisline, ' ', nextline-thisline)))
- ohshit(_(syntax error in statoverride file));
-*ptr=0;
-fso-mode=strtol(thisline, endptr, 8);
-if (thisline == endptr || *endptr)
- ohshit(_(syntax error: invalid mode in statoverride file));
-
-/* Move to the next bit */
-thisline=ptr+1;
-if (thisline=loaded_list_end)
- ohshit(_(unexpected end of line in statoverride file));
-
-fnn= findnamenode(thisline, 0);
-if (fnn-statoverride)
- ohshit(_(multiple statusoverides present for file '%.250s'), thisline);
-fnn-statoverride=fso;
-/* Moving on.. */
-thisline=nextline;
- }
-
- onerr_abort
[SCM] dpkg's main repository branch, master, updated. 1.15.2-25-g8e9df75
The following commit has been merged in the master branch:
commit db05f74c3fad40c90b5a8a48930ceeecc2a00d80
Author: Guillem Jover guil...@debian.org
Date: Tue Jun 16 22:11:11 2009 +0200
Refactor statdb field parsing functions
diff --git a/src/filesdb.h b/src/filesdb.h
index 404ff40..4b01be2 100644
--- a/src/filesdb.h
+++ b/src/filesdb.h
@@ -136,6 +136,10 @@ void iterfileend(struct fileiterator *i);
void ensure_package_clientdata(struct pkginfo *pkg);
void ensure_diversions(void);
+
+uid_t statdb_parse_uid(const char *str);
+gid_t statdb_parse_gid(const char *str);
+mode_t statdb_parse_mode(const char *str);
void ensure_statoverrides(void);
void ensure_packagefiles_available(struct pkginfo *pkg);
diff --git a/src/statdb.c b/src/statdb.c
index a2a55f0..5f12b4e 100644
--- a/src/statdb.c
+++ b/src/statdb.c
@@ -46,6 +46,61 @@
static FILE *statoverridefile = NULL;
+uid_t
+statdb_parse_uid(const char *str)
+{
+ char* endptr;
+ uid_t uid;
+
+ if (str[0] == '#') {
+ uid = strtol(str + 1, endptr, 10);
+ if (str + 1 == endptr || *endptr)
+ ohshit(_(syntax error: invalid uid in statoverride
file));
+ } else {
+ struct passwd* pw = getpwnam(str);
+ if (pw == NULL)
+ ohshit(_(syntax error: unknown user '%s' in
statoverride file),
+ str);
+ uid = pw-pw_uid;
+ }
+
+ return uid;
+}
+
+gid_t
+statdb_parse_gid(const char *str)
+{
+ char* endptr;
+ gid_t gid;
+
+ if (str[0] == '#') {
+ gid = strtol(str + 1, endptr, 10);
+ if (str + 1 == endptr || *endptr)
+ ohshit(_(syntax error: invalid gid in statoverride
file));
+ } else {
+ struct group* gr = getgrnam(str);
+ if (gr == NULL)
+ ohshit(_(syntax error: unknown group '%s' in
statoverride file),
+ str);
+ gid = gr-gr_gid;
+ }
+
+ return gid;
+}
+
+mode_t
+statdb_parse_mode(const char *str)
+{
+ char* endptr;
+ mode_t mode;
+
+ mode = strtol(str, endptr, 8);
+ if (str == endptr || *endptr)
+ ohshit(_(syntax error: invalid mode in statoverride file));
+
+ return mode;
+}
+
void
ensure_statoverrides(void)
{
@@ -106,8 +161,6 @@ ensure_statoverrides(void)
thisline = loaded_list;
while (thisline loaded_list_end) {
- char* endptr;
-
fso = nfmalloc(sizeof(struct filestatoverride));
if (!(ptr = memchr(thisline, '\n', loaded_list_end - thisline)))
@@ -122,17 +175,8 @@ ensure_statoverrides(void)
if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
ohshit(_(syntax error in statoverride file));
*ptr = 0;
- if (thisline[0] == '#') {
- fso-uid = strtol(thisline + 1, endptr, 10);
- if (thisline + 1 == endptr || *endptr)
- ohshit(_(syntax error: invalid uid in
statoverride file));
- } else {
- struct passwd* pw = getpwnam(thisline);
- if (pw == NULL)
- ohshit(_(syntax error: unknown user '%s' in
statoverride file),
- thisline);
- fso-uid = pw-pw_uid;
- }
+
+ fso-uid = statdb_parse_uid(thisline);
/* Move to the next bit */
thisline = ptr + 1;
@@ -143,17 +187,8 @@ ensure_statoverrides(void)
if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
ohshit(_(syntax error in statoverride file));
*ptr = 0;
- if (thisline[0] == '#') {
- fso-gid = strtol(thisline + 1, endptr, 10);
- if (thisline + 1 == endptr || *endptr)
- ohshit(_(syntax error: invalid gid in
statoverride file));
- } else {
- struct group* gr = getgrnam(thisline);
- if (gr == NULL)
- ohshit(_(syntax error: unknown group '%s' in
statoverride file),
- thisline);
- fso-gid = gr-gr_gid;
- }
+
+ fso-gid = statdb_parse_gid(thisline);
/* Move to the next bit */
thisline = ptr + 1;
@@ -164,9 +199,8 @@ ensure_statoverrides(void)
if (!(ptr = memchr(thisline, ' ', nextline - thisline)))
ohshit(_(syntax error in statoverride file));
*ptr = 0;
- fso-mode = strtol(thisline, endptr, 8);
- if (thisline == endptr || *endptr)
- ohshit(_(syntax error: invalid
[SCM] dpkg's main repository branch, master, updated. 1.15.2-25-g8e9df75
The following commit has been merged in the master branch:
commit 8e9df75625168c0a7631fdbd5f5e27f05cd56b95
Author: Guillem Jover guil...@debian.org
Date: Wed Jun 17 03:32:25 2009 +0200
dpkg-name: Rewrite in perl
diff --git a/debian/changelog b/debian/changelog
index 6ca21c8..226a21c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
* Unset TAR_OPTIONS when extracting .deb archives. Closes: #530860
* Use default compressor values in dpkg-source from Dpkg::Source::Compressor.
* Fix dpkg-scanpackages to properly detect spurious overrides.
+ * Rewrite dpkg-name in perl.
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f0fcdd3..61e33ab 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = \
dpkg-genchanges.pl \
dpkg-gencontrol.pl \
dpkg-gensymbols.pl \
- dpkg-name.sh \
+ dpkg-name.pl \
dpkg-parsechangelog.pl \
dpkg-scanpackages.pl \
dpkg-scansources.pl \
@@ -129,19 +129,12 @@ do_perl_subst = sed -e
s:^\#![:space:]*/usr/bin/perl:\#!$(PERL): \
-e
s:\$$admindir[[:space:]]*=[[:space:]]*['\][^'\]*['\]:\$$admindir=\$(admindir)\:
\
-e
s:\$$version[[:space:]]*=[[:space:]]*['\][^'\]*[\']:\$$version=\$(PACKAGE_VERSION)\:
-do_shell_subst = sed -e s:version=\[^\]*\:version=\$(PACKAGE_VERSION)\:
-
%: %.pl Makefile
@test -d `dirname $...@` || $(mkdir_p) `dirname $...@`
$(do_perl_subst) $ $@
chmod +x $@
-%: %.sh Makefile
- @test -d `dirname $...@` || $(mkdir_p) `dirname $...@`
- $(do_shell_subst) $ $@
- chmod +x $@
-
# Automake has its own install-info rule, gah
all-local: install-info-stamp
diff --git a/scripts/dpkg-name.pl b/scripts/dpkg-name.pl
new file mode 100755
index 000..3dbd164
--- /dev/null
+++ b/scripts/dpkg-name.pl
@@ -0,0 +1,256 @@
+#!/usr/bin/perl
+#
+# dpkg-name
+#
+# Copyright © 1995,1996 Erick Branderhorst brand...@debian.org.
+# Copyright © 2009 Guillem Jover guil...@debian.org.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+use warnings;
+use strict;
+
+use File::Basename;
+use File::Path;
+
+use Dpkg;
+use Dpkg::Gettext;
+use Dpkg::ErrorHandling;
+use Dpkg::Cdata;
+use Dpkg::Arch qw(get_host_arch);
+
+textdomain(dpkg-dev);
+
+my %options = (
+subdir = 0,
+destdir = ,
+createdir = 0,
+overwrite = 0,
+symlink = 0,
+architecture = 1,
+);
+
+sub version()
+{
+printf(_g(Debian %s version %s.\n), $progname, $version);
+}
+
+sub usage()
+{
+printf(_g(Usage: %s [option...] file...\n), $progname);
+
+print(_g(
+Options:
+ -a, --no-architectureno architecture part in filename.
+ -o, --overwrite overwrite if file exists.
+ -k, --symlinkdon't create a new file, but a symlink.
+ -s, --subdir [dir] move file into subdir (use with care).
+ -c, --create-dir create target dir if not there (use with care).
+ -h, --help show this help message.
+ -v, --versionshow the version.
+
+file.deb changes to package_version_architecture.package_type
+according to the 'underscores convention'.
+));
+}
+
+sub fileexists($)
+{
+my ($filename) = @_;
+
+if (-f $filename) {
+return 1;
+} else {
+warning(_g(cannot find '%s'), $filename);
+return 0;
+}
+}
+
+sub filesame($$)
+{
+my ($a, $b) = @_;
+my @sta = stat($a);
+my @stb = stat($b);
+
+# Same device and inode numbers.
+return (@sta and @stb and $sta[0] == $stb[0] and $sta[1] == $stb[1]);
+}
+
+sub getfields($)
+{
+my ($filename) = @_;
+
+# Read the fields
+open(CDATA, '-|', dpkg-deb, -f, --, $filename) ||
+syserr(_g(cannot open %s), $filename);
+my $fields = parsecdata(\*CDATA,
+sprintf(_g(binary control file %s), $filename));
+close(CDATA);
+
+return $fields;
+}
+
+sub getarch($$)
+{
+my ($filename, $fields) = @_;
+
+my $arch = $fields-{Architecture};
+if (!$fields-{Architecture} and !$options{architecture}) {
+$arch = get_host_arch();
+warning(g_(assuming architecture '%s' for '%s'), $arch
[SCM] dpkg's main repository branch, master, updated. 1.15.2-27-g9574034
The following commit has been merged in the master branch: commit 95740341e95db8ac78fad3139ec3b58d3feb2f37 Author: Guillem Jover guil...@debian.org Date: Thu Jun 18 16:35:03 2009 +0200 dpkg-architecture: Remove unused variable diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl index 15bb0f4..dd26c28 100755 --- a/scripts/dpkg-architecture.pl +++ b/scripts/dpkg-architecture.pl @@ -77,7 +77,6 @@ sub list_arches() my $req_host_arch = ''; my $req_host_gnu_type = ''; -my $req_build_gnu_type = ''; my $req_eq_arch = ''; my $req_is_arch = ''; my $req_variable_to_print; -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-29-gf40457f
The following commit has been merged in the master branch:
commit f40457f44f442d1394859e0c003b6d7437eb8386
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 19 11:24:49 2009 +0200
Use NUL character instead of 0
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 624882c..1e3447b 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -132,7 +132,7 @@ static struct _finfo* getfi(const char* root, int fd) {
}
if (res==0)// EOF - parent died
return NULL;
-if (fn[i]==0)
+if (fn[i] == '\0')
break;
i++;
@@ -323,7 +323,7 @@ void do_build(const char *const *argv) {
while ((c= getc(cf)) != EOF c != '\n');
continue;
}
-conffilename[n-1]= 0;
+conffilename[n - 1] = '\0';
strcpy(controlfile, directory);
strcat(controlfile, /);
strcat(controlfile, conffilename);
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index 5cc6660..0a2fd96 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -79,7 +79,7 @@ parseheaderlength(const char *inh, size_t len,
assert(sizeof(lintbuf) len);
memcpy(lintbuf,inh,len);
lintbuf[len]= ' ';
- *strchr(lintbuf,' ')= 0;
+ *strchr(lintbuf, ' ') = '\0';
r = strtol(lintbuf, endp, 10);
if (r 0)
ohshit(_(file `%.250s' is corrupt - negative member length %zi), fn, r);
@@ -147,18 +147,18 @@ void extracthalf(const char *debar, const char *directory,
infobuf= m_malloc(memberlen+1);
if (fread(infobuf,1, memberlen + (memberlen1), ar) != memberlen +
(memberlen1))
readfail(ar,debar,_(header info member));
-infobuf[memberlen]= 0;
+infobuf[memberlen] = '\0';
cur= strchr(infobuf,'\n');
if (!cur) ohshit(_(archive has no newlines in header));
-*cur= 0;
+*cur = '\0';
cur= strchr(infobuf,'.');
if (!cur) ohshit(_(archive has no dot in version number));
-*cur= 0;
+*cur = '\0';
if (strcmp(infobuf,2))
ohshit(_(archive version %.250s not understood, get newer
dpkg-deb), infobuf);
*cur= '.';
strncpy(versionbuf,infobuf,sizeof(versionbuf));
-versionbuf[sizeof(versionbuf)-1]= 0;
+versionbuf[sizeof(versionbuf) - 1] = '\0';
header_done= 1;
} else if (arh.ar_name[0] == '_') {
/* Members with `_' are noncritical, and if we don't understand them
@@ -215,7 +215,9 @@ void extracthalf(const char *debar, const char *directory,
nlc == '\n') {
oldformat= 1;
-l= strlen(versionbuf); if (l versionbuf[l-1]=='\n') versionbuf[l-1]=0;
+l = strlen(versionbuf);
+if (l versionbuf[l - 1] == '\n')
+ versionbuf[l - 1] = '\0';
if (!fgets(ctrllenbuf,sizeof(ctrllenbuf),ar))
readfail(ar, debar, _(control information length));
if (sscanf(ctrllenbuf,%zi%c%d,ctrllennum,nlc,dummy) !=2 || nlc !=
'\n')
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 3d97742..7fb3adb 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -142,7 +142,8 @@ static void info_list(const char *debar, const char
*directory) {
if (S_ISREG(stab.st_mode)) {
if (!(cc= fopen(cdep-d_name,r)))
ohshite(_(cannot open `%.255s' (in
`%.255s')),cdep-d_name,directory);
- lines= 0; interpreter[0]= 0;
+ lines = 0;
+ interpreter[0] = '\0';
if ((c= getc(cc))== '#') {
if ((c= getc(cc))== '!') {
while ((c= getc(cc))== ' ');
@@ -150,7 +151,7 @@ static void info_list(const char *debar, const char
*directory) {
while (ilINTERPRETER_MAX !isspace(c) c!=EOF) {
*p++= c; il++; c= getc(cc);
}
- *p++= 0;
+ *p++ = '\0';
if (c=='\n') lines++;
}
}
@@ -200,7 +201,7 @@ static void info_field(const char *debar, const char
*directory,
for (pf=fieldname, fnl=0;
fnl = MAXFIELDNAME c!=EOF !isspace(c) c!=':';
c= getc(cc)) { *pf++= c; fnl++; }
- *pf++= 0;
+ *pf++ = '\0';
doing= fnl = MAXFIELDNAME || c=='\n' || c==EOF;
for (fp=fields; !doing *fp; fp++)
if (!strcasecmp(*fp,fieldname)) doing=1;
diff --git a/dpkg-split/info.c b/dpkg-split/info.c
index 94cbe87..2eb5969 100644
--- a/dpkg-split/info.c
+++ b/dpkg-split/info.c
@@ -57,7 +57,7 @@ static unsigned long parseheaderlength(const char *inh,
size_t len,
assert(sizeof(lintbuf) len);
memcpy(lintbuf,inh,len);
lintbuf[len]= ' ';
- *strchr(lintbuf,' ')= 0;
+ *strchr(lintbuf, ' ') = '\0';
return unsignedlong(lintbuf,fn,what);
}
@@ -71,7 +71,7 @@ static char *nextline(char **ripp, const char *fn, const char
*what) {
ohshit(_(file `%.250s' is corrupt - missing newline after
%.250s),fn,what);
*ripp= newline+1;
while (newline rip isspace(newline[-1])) newline--;
- *newline= 0;
+ *newline = '\0';
return rip;
}
@@ -109,7 +109,7 @@ struct partinfo *read_info(FILE *partfile, const char *fn,
struct partinfo
[SCM] dpkg's main repository branch, master, updated. 1.15.2-64-gee21a3b
The following commit has been merged in the master branch:
commit d5ad25d85434acd7a4532334db2381a03d288ccd
Author: Guillem Jover guil...@debian.org
Date: Wed Jun 24 05:51:33 2009 +0200
libdpkg: Suffix path related function names with ‘path_’
diff --git a/lib/dpkg-priv.h b/lib/dpkg-priv.h
index 7c842c2..f14fe66 100644
--- a/lib/dpkg-priv.h
+++ b/lib/dpkg-priv.h
@@ -50,8 +50,8 @@ char *str_escape_fmt(char *dest, const char *src);
/* Path handling. */
-size_t rtrim_slash_slashdot(char *path);
-const char *skip_slash_dotslash(const char *path);
+size_t path_rtrim_slash_slashdot(char *path);
+const char *path_skip_slash_dotslash(const char *path);
/* Subprocess handling. */
diff --git a/lib/fields.c b/lib/fields.c
index fb2bb55..3d1331d 100644
--- a/lib/fields.c
+++ b/lib/fields.c
@@ -285,7 +285,7 @@ void f_conffiles(struct pkginfo *pigp, struct
pkginfoperfile *pifp,
hashstart, hashlen, endfn,
filename, lno, pigp);
newlink= nfmalloc(sizeof(struct conffile));
-value= skip_slash_dotslash(value);
+value = path_skip_slash_dotslash(value);
namelen= (int)(endfn-value);
if (namelen = 0)
parse_error(filename, lno, pigp,
diff --git a/lib/path.c b/lib/path.c
index 54ca5e7..ea076a4 100644
--- a/lib/path.c
+++ b/lib/path.c
@@ -27,7 +27,7 @@
#include dpkg-priv.h
size_t
-rtrim_slash_slashdot(char *path)
+path_rtrim_slash_slashdot(char *path)
{
char *end;
@@ -45,7 +45,7 @@ rtrim_slash_slashdot(char *path)
}
const char *
-skip_slash_dotslash(const char *path)
+path_skip_slash_dotslash(const char *path)
{
while (path[0] == '/' || (path[0] == '.' path[1] == '/'))
path++;
diff --git a/lib/test/t-path.c b/lib/test/t-path.c
index 2bb8b57..de7258f 100644
--- a/lib/test/t-path.c
+++ b/lib/test/t-path.c
@@ -29,7 +29,7 @@
#define test_trim_eq_ref(p, ref) \
do { \
char *t = strdup((p)); \
- rtrim_slash_slashdot(t); \
+ path_rtrim_slash_slashdot(t); \
test_str(t, ==, (ref)); \
free(t); \
} while (0)
@@ -55,18 +55,18 @@ test_path_rtrim(void)
static void
test_path_skip(void)
{
- test_str(skip_slash_dotslash(./././.), ==, .);
- test_str(skip_slash_dotslash(./././), ==, );
- test_str(skip_slash_dotslash(./.), ==, .);
- test_str(skip_slash_dotslash(./), ==, );
- test_str(skip_slash_dotslash(/./././.), ==, .);
- test_str(skip_slash_dotslash(/./), ==, );
- test_str(skip_slash_dotslash(/.), ==, .);
- test_str(skip_slash_dotslash(/), ==, );
- test_str(skip_slash_dotslash(/./../.), ==, ../.);
- test_str(skip_slash_dotslash(/foo/bar/./), ==, foo/bar/./);
- test_str(skip_slash_dotslash(./foo/bar/./), ==, foo/bar/./);
- test_str(skip_slash_dotslash(/./foo/bar/./), ==, foo/bar/./);
+ test_str(path_skip_slash_dotslash(./././.), ==, .);
+ test_str(path_skip_slash_dotslash(./././), ==, );
+ test_str(path_skip_slash_dotslash(./.), ==, .);
+ test_str(path_skip_slash_dotslash(./), ==, );
+ test_str(path_skip_slash_dotslash(/./././.), ==, .);
+ test_str(path_skip_slash_dotslash(/./), ==, );
+ test_str(path_skip_slash_dotslash(/.), ==, .);
+ test_str(path_skip_slash_dotslash(/), ==, );
+ test_str(path_skip_slash_dotslash(/./../.), ==, ../.);
+ test_str(path_skip_slash_dotslash(/foo/bar/./), ==, foo/bar/./);
+ test_str(path_skip_slash_dotslash(./foo/bar/./), ==, foo/bar/./);
+ test_str(path_skip_slash_dotslash(/./foo/bar/./), ==, foo/bar/./);
}
static void
diff --git a/src/filesdb.c b/src/filesdb.c
index fc178f3..202991d 100644
--- a/src/filesdb.c
+++ b/src/filesdb.c
@@ -392,7 +392,7 @@ struct filenamenode *findnamenode(const char *name, enum
fnnflags flags) {
const char *orig_name = name;
/* We skip initial slashes and ./ pairs, and add our own single leading
slash. */
- name= skip_slash_dotslash(name);
+ name = path_skip_slash_dotslash(name);
pointerp= bins + (hash(name) (BINS-1));
while (*pointerp) {
diff --git a/src/help.c b/src/help.c
index 5d62b43..330c599 100644
--- a/src/help.c
+++ b/src/help.c
@@ -523,7 +523,7 @@ void ensure_pathname_nonexisting(const char *pathname) {
int c1;
const char *u, *failed;
- u= skip_slash_dotslash(pathname);
+ u = path_skip_slash_dotslash(pathname);
assert(*u);
debug(dbg_eachfile,ensure_pathname_nonexisting `%s',pathname);
diff --git a/src/query.c b/src/query.c
index ddc..9e68d29 100644
--- a/src/query.c
+++ b/src/query.c
@@ -246,7 +246,7 @@ void searchfiles(const char *const *argv) {
varbufaddstr(path, thisarg);
varbufaddc(path, '\0');
- path.used = rtrim_slash_slashdot(path.buf);
+ path.used = path_rtrim_slash_slashdot(path.buf);
thisarg = path.buf;
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas
[SCM] dpkg's main repository branch, master, updated. 1.15.2-64-gee21a3b
The following commit has been merged in the master branch: commit d30fdccff56e8ed63e81e7e114c421d5c806d8e7 Author: Guillem Jover guil...@debian.org Date: Fri Nov 21 16:46:30 2008 +0200 libdpkg: Do not try to close already closed files diff --git a/debian/changelog b/debian/changelog index a0866d7..3566257 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low * Use default compressor values in dpkg-source from Dpkg::Source::Compressor. * Fix dpkg-scanpackages to properly detect spurious overrides. * Rewrite dpkg-name in perl. + * Do not close already closed files in some error conditions in libdpkg. [ Raphael Hertzog ] * Unset TAR_OPTIONS when creating/extracting tar archives for source diff --git a/lib/triglib.c b/lib/triglib.c index 3a135d2..b9344b0 100644 --- a/lib/triglib.c +++ b/lib/triglib.c @@ -404,10 +404,14 @@ trk_explicit_interest_change(const char *trig, struct pkginfo *pkg, int signum) } if (signum 0) fprintf(nf, %s\n, pkg-name); - if (ferror(nf) || fclose(nf)) + + if (ferror(nf)) ohshite(_(unable to write new trigger interest file `%.250s'), newfn.buf); pop_cleanup(ehflag_normaltidy); + if (fclose(nf)) + ohshite(_(unable to close new trigger interest file `%.250s'), + newfn.buf); if (rename(newfn.buf, trk_explicit_fn.buf)) ohshite(_(unable to install new trigger interest file `%.250s'), @@ -498,10 +502,13 @@ trig_file_interests_save(void) fprintf(nf, %s %s\n, trigh.namenode_name(tfi-fnn), tfi-pkg-name); - if (ferror(nf) || fclose(nf)) + if (ferror(nf)) ohshite(_(unable to write new file triggers file `%.250s'), triggersnewfilefile); pop_cleanup(ehflag_normaltidy); + if (fclose(nf)) + ohshite(_(unable to close new file triggers file `%.250s'), + triggersnewfilefile); if (rename(triggersnewfilefile, triggersfilefile)) ohshite(_(unable to install new file triggers file as `%.250s'), -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-64-gee21a3b
The following commit has been merged in the master branch:
commit a3454abb5b83ac12aec5c52f2ae4492faf6890c8
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 01:52:58 2009 +0200
dpkg-split: Use the correct units (KiB) when referring to partsize
diff --git a/debian/changelog b/debian/changelog
index 3566257..d7e4b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
* Fix dpkg-scanpackages to properly detect spurious overrides.
* Rewrite dpkg-name in perl.
* Do not close already closed files in some error conditions in libdpkg.
+ * Use the correct units (KiB) in dpkg-split when referring to partsize.
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index 2b8640a..55d8e41 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -122,7 +122,7 @@ static void setpartsize(const struct cmdinfo *cip, const
char *value) {
maxpartsize= newpartsize 10;
if (maxpartsize = HEADERALLOWANCE)
-badusage(_(part size must be at least %dk (to allow for header)),
+badusage(_(part size must be at least %d KiB (to allow for header)),
(HEADERALLOWANCE 10) + 1);
}
diff --git a/man/dpkg-split.1 b/man/dpkg-split.1
index e0ba1f7..7d56532 100644
--- a/man/dpkg-split.1
+++ b/man/dpkg-split.1
@@ -141,8 +141,8 @@ Specifies an alternative directory for the queue of parts
awaiting
automatic reassembly. The default is
.BR /var/lib/dpkg .
.TP
-.BR \-S , \-\-partsize \fIkbytes\fP
-Specifies the maximum part size when splitting, in kilobytes (1024
+.BR \-S , \-\-partsize \fIkibibytes\fP
+Specifies the maximum part size when splitting, in kibibytes (1024
bytes). The default is 450 KiB.
.TP
.BR \-o , \-\-output \fIcomplete-output\fP
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-64-gee21a3b
The following commit has been merged in the master branch: commit ee21a3b9443f7a7a643fa1d41bf1ba2b93e32ccb Author: Guillem Jover guil...@debian.org Date: Fri Jun 26 02:10:53 2009 +0200 man: Document in dpkg-statoverride the format to specify mode Closes: #534551 diff --git a/debian/changelog b/debian/changelog index d7e4b83..cabc83f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ dpkg (1.15.3) UNRELEASED; urgency=low * Rewrite dpkg-name in perl. * Do not close already closed files in some error conditions in libdpkg. * Use the correct units (KiB) in dpkg-split when referring to partsize. + * Document in dpkg-statoverride(8) that mode needs to be specified in +octal. Closes: #534551 [ Raphael Hertzog ] * Unset TAR_OPTIONS when creating/extracting tar archives for source diff --git a/man/dpkg-statoverride.8 b/man/dpkg-statoverride.8 index 7c93709..c0a1e8e 100644 --- a/man/dpkg-statoverride.8 +++ b/man/dpkg-statoverride.8 @@ -28,7 +28,8 @@ Add an override for \fBfile\fR. \fBfile\fR does not need to exist when this command is used; the override will be stored and used later. Users and groups can be specified by their name (for example \fBroot\fR or \fBnobody\fR), or by their number by prepending the number with a -`\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). +`\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). The \fImode\fR needs +to be specified in octal. If \-\-update is specified and \fBfile\fR exists, it is immediately set to the new owner and mode. -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch: commit e29457dd5f8bfc8f6fc913b1899919f98be93bd7 Author: Guillem Jover guil...@debian.org Date: Fri Jun 26 03:30:57 2009 +0200 man: Mark argument names in dpkg-statoverride.1 in italic diff --git a/debian/changelog b/debian/changelog index cabc83f..3e2032c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low * Use the correct units (KiB) in dpkg-split when referring to partsize. * Document in dpkg-statoverride(8) that mode needs to be specified in octal. Closes: #534551 + * Mark argument names in dpkg-statoverride.1 in italic. [ Raphael Hertzog ] * Unset TAR_OPTIONS when creating/extracting tar archives for source diff --git a/man/dpkg-statoverride.8 b/man/dpkg-statoverride.8 index c0a1e8e..584f239 100644 --- a/man/dpkg-statoverride.8 +++ b/man/dpkg-statoverride.8 @@ -1,4 +1,4 @@ -.TH dpkg\-statoverride 8 2008-08-18 Debian project dpkg utilities +.TH dpkg\-statoverride 8 2009-06-26 Debian project dpkg utilities .SH NAME dpkg\-statoverride \- override ownership and mode of files . @@ -24,18 +24,18 @@ overrides. .SH COMMANDS .TP .BI \-\-add user group mode file -Add an override for \fBfile\fR. \fBfile\fR does not need to exist +Add an override for \fIfile\fP. \fIfile\fP does not need to exist when this command is used; the override will be stored and used later. Users and groups can be specified by their name (for example \fBroot\fR or \fBnobody\fR), or by their number by prepending the number with a `\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). The \fImode\fR needs to be specified in octal. -If \-\-update is specified and \fBfile\fR exists, it is immediately +If \-\-update is specified and \fIfile\fP exists, it is immediately set to the new owner and mode. .TP .BI \-\-remove file -Remove an override for \fBfile\fR, the status of \fBfile\fR is left +Remove an override for \fIfile\fP, the status of \fIfile\fP is left unchanged by this command. .TP .BR \-\-list [\fIglob-pattern\fP] @@ -52,7 +52,7 @@ Show the version and exit. .SH OPTIONS .TP .BI \-\-admindir directory -Change the directory of the dpkg database where the statoverride file is +Change the \fIdirectory\fP of the dpkg database where the statoverride file is also stored. Defaults to \fI/var/lib/dpkg\fP. .TP .B \-\-force -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch: commit 0d887820bcb55b60aa423a428eb4919c12acf577 Author: Guillem Jover guil...@debian.org Date: Fri Jun 26 03:32:12 2009 +0200 Unclaim bug closure diff --git a/debian/changelog b/debian/changelog index 3e2032c..6d04f7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low [ Guillem Jover ] - * Unset TAR_OPTIONS when extracting .deb archives. Closes: #530860 + * Unset TAR_OPTIONS when extracting .deb archives. * Use default compressor values in dpkg-source from Dpkg::Source::Compressor. * Fix dpkg-scanpackages to properly detect spurious overrides. * Rewrite dpkg-name in perl. -- dpkg's main repository -- To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch:
commit 3862c3e7fe882c61c53f62294fd84dddee9d2f46
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 04:50:33 2009 +0200
libdpkg-perl: Import Exporter with ‘use base’
We don't need to set @ISA now.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index f65a15d..5ce0902 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -3,8 +3,7 @@ package Dpkg::Arch;
use strict;
use warnings;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT_OK = qw(get_raw_build_arch get_raw_host_arch
get_build_arch get_host_arch get_gcc_host_gnu_type
get_valid_arches debarch_eq debarch_is
diff --git a/scripts/Dpkg/Cdata.pm b/scripts/Dpkg/Cdata.pm
index 48b7099..58fdc3a 100644
--- a/scripts/Dpkg/Cdata.pm
+++ b/scripts/Dpkg/Cdata.pm
@@ -23,8 +23,7 @@ use Dpkg::Gettext;
use Dpkg::ErrorHandling;
use Dpkg::Fields qw(capit);;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT = qw(parsecdata);
=head1 NAME
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index b30adb7..e4afd88 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -73,7 +73,7 @@ use Dpkg::Arch qw(get_host_arch);
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT_OK = qw(@pkg_dep_fields @src_dep_fields %dep_field_type
%relation_ordering);
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index fe32896..6d1194f 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -3,10 +3,9 @@ package Dpkg::Fields;
use strict;
use warnings;
-use Exporter;
+use base qw(Exporter);
use Dpkg::Deps qw(@src_dep_fields @pkg_dep_fields);
-our @ISA = qw(Exporter);
our @EXPORT_OK = qw(capit %control_src_fields %control_pkg_fields
$control_src_field_regex $control_pkg_field_regex);
our %EXPORT_TAGS = ('list' = [qw(%control_src_fields %control_pkg_fields
diff --git a/scripts/Dpkg/IPC.pm b/scripts/Dpkg/IPC.pm
index 52ca9f5..7fee43f 100644
--- a/scripts/Dpkg/IPC.pm
+++ b/scripts/Dpkg/IPC.pm
@@ -23,8 +23,7 @@ use warnings;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT = qw(fork_and_exec wait_child);
=head1 NAME
diff --git a/scripts/Dpkg/Path.pm b/scripts/Dpkg/Path.pm
index 18b59b4..9833fac 100644
--- a/scripts/Dpkg/Path.pm
+++ b/scripts/Dpkg/Path.pm
@@ -19,10 +19,9 @@ package Dpkg::Path;
use strict;
use warnings;
-use Exporter;
+use base qw(Exporter);
use File::Spec;
use Cwd qw(realpath);
-our @ISA = qw(Exporter);
our @EXPORT_OK = qw(get_pkg_root_dir relative_to_pkg_root
guess_pkg_root_dir check_files_are_the_same
resolve_symlink canonpath);
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 0f4196a..a359d6e 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -3,8 +3,7 @@ package Dpkg::Source::Functions;
use strict;
use warnings;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT_OK = qw(erasedir fixperms is_binary);
use Dpkg::ErrorHandling;
diff --git a/scripts/Dpkg/Vars.pm b/scripts/Dpkg/Vars.pm
index c82358c..738110f 100644
--- a/scripts/Dpkg/Vars.pm
+++ b/scripts/Dpkg/Vars.pm
@@ -22,8 +22,7 @@ use warnings;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT = qw($sourcepackage set_source_package);
our $sourcepackage;
diff --git a/scripts/Dpkg/Vendor.pm b/scripts/Dpkg/Vendor.pm
index 3df1c1e..0061c29 100644
--- a/scripts/Dpkg/Vendor.pm
+++ b/scripts/Dpkg/Vendor.pm
@@ -23,8 +23,7 @@ use Dpkg::ErrorHandling;
use Dpkg::Gettext;
use Dpkg::Cdata;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT_OK = qw(get_vendor_info get_current_vendor get_vendor_file
get_vendor_object run_vendor_hook);
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index e4afab5..0a83fdd 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -24,8 +24,7 @@ use warnings;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
-use Exporter;
-our @ISA = qw(Exporter);
+use base qw(Exporter);
our @EXPORT_OK = qw(vercmp compare_versions check_version parseversion);
=head1 NAME
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch:
commit 0e1e63afa089bca6f70a574f11033b724a6fc3c8
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 04:04:16 2009 +0200
dpkg-scanpackages: Remove commented out code
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index e8ab441..d2e0803 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -149,8 +149,6 @@ else {
}
push @find_args, '-follow';
-#push @ARGV, undef if @ARGV 2;
-#push @ARGV, ''if @ARGV 3;
my ($binarydir, $override, $pathprefix) = @ARGV;
-d $binarydir or error(_g(Binary dir %s not found), $binarydir);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch:
commit a3e560fe5d095e989dcfcda1935e51d72b82b780
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 05:16:05 2009 +0200
libdpkg-perl: Move unknown() from Dpkg::ErrorHandling to Dpkg::Fields
diff --git a/debian/changelog b/debian/changelog
index 1d295ce..fe8d6ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
octal. Closes: #534551
* Mark argument names in dpkg-statoverride.1 in italic.
* Explicitly pass field argument to Dpkg::ErrorHandling::unknown().
+ * Move unknown() from Dpkg::ErrorHandling to Dpkg::Fields.
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index 4c5cefe..6b6b195 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -6,7 +6,7 @@ use Dpkg::Gettext;
use base qw(Exporter);
our @EXPORT = qw(report_options info warning error errormsg
syserr internerr subprocerr usageerr syntaxerr);
-our @EXPORT_OK = qw(report unknown);
+our @EXPORT_OK = qw(report);
my $quiet_warnings = 0;
my $info_fh = \*STDOUT;
@@ -62,14 +62,6 @@ sub internerr($;@)
die report(_g(internal error), @_);
}
-sub unknown($$)
-{
-my ($field, $desc) = @_;
-
-warning(_g(unknown information field '%s' in input data in %s),
-$field, $desc);
-}
-
sub subprocerr(@)
{
my ($p) = (shift);
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index 6d1194f..90a32ca 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -4,9 +4,11 @@ use strict;
use warnings;
use base qw(Exporter);
+use Dpkg::Gettext;
+use Dpkg::ErrorHandling;
use Dpkg::Deps qw(@src_dep_fields @pkg_dep_fields);
-our @EXPORT_OK = qw(capit %control_src_fields %control_pkg_fields
+our @EXPORT_OK = qw(capit unknown %control_src_fields %control_pkg_fields
$control_src_field_regex $control_pkg_field_regex);
our %EXPORT_TAGS = ('list' = [qw(%control_src_fields %control_pkg_fields
$control_src_field_regex $control_pkg_field_regex)]);
@@ -33,6 +35,14 @@ sub capit {
return join '-', @pieces;
}
+sub unknown($$)
+{
+my ($field, $desc) = @_;
+
+warning(_g(unknown information field '%s' in input data in %s),
+$field, $desc);
+}
+
package Dpkg::Fields::Object;
=head1 OTHER OBJECTS
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 29ae0af..5c28859 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -9,9 +9,9 @@ use English;
use Dpkg;
use Dpkg::Gettext;
use Dpkg::Checksums;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
-use Dpkg::Fields qw(:list capit);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Compression;
use Dpkg::Control;
use Dpkg::Cdata;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 25884f4..73c9dc9 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -7,10 +7,10 @@ use POSIX;
use POSIX qw(:errno_h);
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
use Dpkg::Arch qw(get_host_arch debarch_eq debarch_is);
use Dpkg::Deps qw(@pkg_dep_fields %dep_field_type);
-use Dpkg::Fields qw(:list capit);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Control;
use Dpkg::Substvars;
use Dpkg::Vars;
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index f73debc..cf13936 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -6,10 +6,10 @@ use warnings;
use Dpkg;
use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(:DEFAULT unknown);
+use Dpkg::ErrorHandling;
use Dpkg::Arch qw(debarch_eq);
use Dpkg::Deps qw(@src_dep_fields %dep_field_type);
-use Dpkg::Fields qw(:list capit);
+use Dpkg::Fields qw(:list capit unknown);
use Dpkg::Compression;
use Dpkg::Control;
use Dpkg::Substvars;
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.2-70-ga3e560f
The following commit has been merged in the master branch:
commit b05060cb961a6dcb1eac5cc1796058dbc2bdbfad
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 05:05:49 2009 +0200
Dpkg::ErrorHandling: Explicitly pass field argument to unknown()
diff --git a/debian/changelog b/debian/changelog
index 6d04f7c..1d295ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dpkg (1.15.3) UNRELEASED; urgency=low
* Document in dpkg-statoverride(8) that mode needs to be specified in
octal. Closes: #534551
* Mark argument names in dpkg-statoverride.1 in italic.
+ * Explicitly pass field argument to Dpkg::ErrorHandling::unknown().
[ Raphael Hertzog ]
* Unset TAR_OPTIONS when creating/extracting tar archives for source
diff --git a/scripts/Dpkg/ErrorHandling.pm b/scripts/Dpkg/ErrorHandling.pm
index cc6b8fe..4c5cefe 100644
--- a/scripts/Dpkg/ErrorHandling.pm
+++ b/scripts/Dpkg/ErrorHandling.pm
@@ -62,12 +62,12 @@ sub internerr($;@)
die report(_g(internal error), @_);
}
-sub unknown($)
+sub unknown($$)
{
-# XXX: implicit argument
-my $field = $_;
+my ($field, $desc) = @_;
+
warning(_g(unknown information field '%s' in input data in %s),
-$field, $_[0]);
+$field, $desc);
}
sub subprocerr(@)
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index e64d912..29ae0af 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -270,7 +270,7 @@ foreach $_ (keys %{$src_fields}) {
} elsif (m/^X[BS]+-/i || m/^$control_src_field_regex$/i) {
# Silently ignore valid fields
} else {
- unknown(_g('general section of control info file'));
+ unknown($_, _g('general section of control info file'));
}
}
@@ -324,7 +324,7 @@ foreach my $pkg ($control-get_packages()) {
} elsif (m/^$control_pkg_field_regex$/ || m/^X[BS]+-/i) {
# Silently ignore valid fields
} else {
- unknown(_g(package's section of control info file));
+ unknown($_, _g(package's section of control info file));
}
}
}
@@ -341,7 +341,7 @@ foreach $_ (keys %{$changelog}) {
} elsif (s/^X[BS]*C[BS]*-//i) {
$fields-{$_} = $v;
} elsif (!m/^X[BS]+-/i) {
- unknown(_g(parsed version of changelog));
+ unknown($_, _g(parsed version of changelog));
}
}
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 19ca39c..25884f4 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -160,7 +160,7 @@ foreach $_ (keys %{$src_fields}) {
} elsif (m/^X[CS]+-/i || m/^$control_src_field_regex$/i) {
# Silently ignore valid fields
} else {
- unknown(_g('general section of control info file'));
+ unknown($_, _g('general section of control info file'));
}
}
@@ -193,7 +193,7 @@ foreach $_ (keys %{$pkg}) {
} elsif (s/^X[CS]*B[CS]*-//i) { # Include XB-* fields
$fields-{$_} = $v;
} elsif (!m/^X[CS]+-/i) {
- unknown(_g(package's section of control info file));
+ unknown($_, _g(package's section of control info file));
}
}
@@ -210,7 +210,7 @@ foreach $_ (keys %{$changelog}) {
} elsif (s/^X[CS]*B[CS]*-//i) {
$fields-{$_} = $v;
} elsif (!m/^X[CS]+-/i) {
- unknown(_g(parsed version of changelog));
+ unknown($_, _g(parsed version of changelog));
}
}
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 03cf0b5..f73debc 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -182,7 +182,7 @@ if ($options{'opmode'} eq 'build') {
} elsif (m/^$control_src_field_regex$/i || m/^X[BC]+-/i) {
# Silently ignore valid fields
} else {
- unknown(_g('general section of control info file'));
+ unknown($_, _g('general section of control info file'));
}
}
@@ -215,7 +215,7 @@ if ($options{'opmode'} eq 'build') {
} elsif (m/^$control_pkg_field_regex$/ ||
m/^X[BC]+-/i) { # Silently ignore valid fields
} else {
-unknown(_g(package's section of control info file));
+unknown($_, _g(package's section of control info file));
}
}
}
@@ -240,7 +240,7 @@ if ($options{'opmode'} eq 'build') {
} elsif (m/^(Maintainer|Changes|Urgency|Distribution|Date|Closes)$/i ||
m/^X[BS]+-/i) {
} else {
- unknown(_g(parsed version of changelog));
+ unknown($_, _g(parsed version of changelog));
}
}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
[SCM] dpkg's main repository branch, master, updated. 1.15.3-1-g34181ce
The following commit has been merged in the master branch:
commit c5b980dacefe000cc09694e0e7313fea5a43acfe
Author: Guillem Jover guil...@debian.org
Date: Fri Jun 26 20:02:27 2009 +0200
dpkg-deb: Remove unused FILE variable
Now that we are not closing gzfd indirectly by fclosing gz, we close it
explicitly.
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index 1e3447b..1b8219b 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -188,7 +188,7 @@ void do_build(const char *const *argv) {
const char *envbuf;
struct pkginfo *checkedinfo;
struct arbitraryfield *field;
- FILE *ar, *gz, *cf;
+ FILE *ar, *cf;
int p1[2],p2[2],p3[2], warns, errs, n, c, subdir, gzfd;
pid_t c1,c2,c3;
struct stat controlstab, datastab, mscriptstab, debarstab;
@@ -373,8 +373,6 @@ void do_build(const char *const *argv) {
* our temporary file so others can't mess with it.
*/
if ((gzfd= mkstemp(tfbuf)) == -1) ohshite(_(failed to make tmpfile
(control)));
- if ((gz= fdopen(gzfd,a)) == NULL) ohshite(_(failed to open tmpfile
- (control), %s), tfbuf);
/* make sure it's gone, the fd will remain until we close it */
if (unlink(tfbuf)) ohshit(_(failed to unlink tmpfile (control), %s),
tfbuf);
@@ -419,10 +417,8 @@ void do_build(const char *const *argv) {
* a new temporary file. Immediately unlink the temporary file so others
* can't mess with it. */
if (!oldformatflag) {
-fclose(gz);
+close(gzfd);
if ((gzfd= mkstemp(tfbuf)) == -1) ohshite(_(failed to make tmpfile
(data)));
-if ((gz= fdopen(gzfd,a)) == NULL) ohshite(_(failed to open tmpfile
-(data), %s), tfbuf);
/* make sure it's gone, the fd will remain until we close it */
if (unlink(tfbuf)) ohshit(_(failed to unlink tmpfile (data), %s),
tfbuf);
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
