The branch, master has been updated
via 19173d231c66bd222631a4a86033aa36d88d01a4 (commit)
via 0f2b6521146c96e83387ce854425d21a4f5979fc (commit)
via 9bcc24992c7f61ba5ad230f9214554d90dde574f (commit)
via c04a83af4a07f5efa7bd56c82183f81b75fd5c7c (commit)
via 47d1d738543c63564f60e885d57639f6766424f5 (commit)
via 73aa35745d57c6c682fe742642ce1d7639f1194e (commit)
from 9e5cec40fd27da067687c1e36aa30f18b1440cb5 (commit)
- Shortlog ------------------------------------------------------------
19173d2 Add lzma to dpkg-dev Depends
0f2b652 s-s-d: Remove redundant function declarations
9bcc249 Add a 'struct stat' forward declaration to fix a compilation warning
c04a83a Add missing PRINTFFORMAT attribute to few function declarations
47d1d73 Use NONRETURNING and PRINTFFORMAT instead of NONRETURNPRINTFFORMAT
attribute
73aa357 Promote bzip2 Recommends to Depends for dpkg-dev
Summary of changes:
ChangeLog | 31 +++++++++++++++++++++++++++++++
debian/changelog | 2 ++
debian/control | 4 ++--
lib/dpkg-db.h | 2 +-
lib/dpkg.h | 25 +++++++++++++------------
src/main.h | 2 ++
utils/start-stop-daemon.c | 9 +--------
7 files changed, 52 insertions(+), 23 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 19173d231c66bd222631a4a86033aa36d88d01a4
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Jan 2 07:24:24 2008 +0200
Add lzma to dpkg-dev Depends
diff --git a/debian/changelog b/debian/changelog
index 6681e7f..3f2dea3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ dpkg (1.14.15) UNRELEASED; urgency=low
* Properly print build message in dpkg-buildpackage for lzma and bzip2
compressed sources. Closes: #458519
* Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521
+ * Add lzma to dpkg-dev Depends.
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/debian/control b/debian/control
index 284964e..9ff6986 100644
--- a/debian/control
+++ b/debian/control
@@ -34,7 +34,7 @@ Package: dpkg-dev
Section: utils
Priority: optional
Architecture: all
-Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2,
+Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2, lzma,
patch (>= 2.2-1), make, binutils
Recommends: gcc | c-compiler
Suggests: gnupg, debian-keyring
commit 0f2b6521146c96e83387ce854425d21a4f5979fc
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Jan 2 06:52:46 2008 +0200
s-s-d: Remove redundant function declarations
diff --git a/ChangeLog b/ChangeLog
index 294274a..883e436 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+ * utils/start-stop-daemon.c [!__GNUC__] (fatal, badusage): Remove
+ redundant function declarations.
+
+2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+
* src/main.h (struct stat): New forward declaration.
2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index e4bbc41..b5cf162 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -176,15 +176,10 @@ static int pid_is_exec(pid_t pid, const struct stat *esb);
#endif
-#ifdef __GNUC__
static void fatal(const char *format, ...)
NONRETURNING PRINTFFORMAT(1, 2);
static void badusage(const char *msg)
NONRETURNING;
-#else
-static void fatal(const char *format, ...);
-static void badusage(const char *msg);
-#endif
/* This next part serves only to construct the TVCALC macro, which
* is used for doing arithmetic on struct timeval's. It works like this:
commit 9bcc24992c7f61ba5ad230f9214554d90dde574f
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Jan 2 06:46:28 2008 +0200
Add a 'struct stat' forward declaration to fix a compilation warning
diff --git a/ChangeLog b/ChangeLog
index 7ae840d..294274a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+ * src/main.h (struct stat): New forward declaration.
+
+2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+
* lib/dpkg.h (warningf): Add PRINTFFORMAT attribute.
(buffer_copy_setup_PtrInt): Likewise.
(buffer_copy_setup_PtrPtr): Likewise.
diff --git a/src/main.h b/src/main.h
index 1011094..15a8303 100644
--- a/src/main.h
+++ b/src/main.h
@@ -178,6 +178,8 @@ void cu_closepipe(int argc, void **argv);
void cu_closedir(int argc, void **argv);
void cu_closefd(int argc, void **argv);
+struct stat;
+
int ignore_depends(struct pkginfo *pkg);
int force_breaks(struct deppossi *possi);
int force_depends(struct deppossi *possi);
commit c04a83af4a07f5efa7bd56c82183f81b75fd5c7c
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Jan 2 06:40:27 2008 +0200
Add missing PRINTFFORMAT attribute to few function declarations
diff --git a/ChangeLog b/ChangeLog
index 90e093a..7ae840d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+ * lib/dpkg.h (warningf): Add PRINTFFORMAT attribute.
+ (buffer_copy_setup_PtrInt): Likewise.
+ (buffer_copy_setup_PtrPtr): Likewise.
+ (buffer_copy_setup_IntPtr): Likewise.
+ (buffer_copy_setup_IntInt): Likewise.
+ (decompress_cat): Likewise.
+ (compress_cat): Likewise.
+ * lib/dpkg-db.h (log_message): Likewise.
+
+2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+
* lib/dpkg.h (NONRETURNPRINTFFORMAT): Remove macro.
(ohshit): Use NONRETURNING and PRINTFFORMAT instead of
NONRETURNPRINTFFORMAT.
diff --git a/lib/dpkg-db.h b/lib/dpkg-db.h
index b6f43af..af7ed0b 100644
--- a/lib/dpkg-db.h
+++ b/lib/dpkg-db.h
@@ -175,7 +175,7 @@ void modstatdb_shutdown(void);
extern char *statusfile, *availablefile; /* initialised by modstatdb_init */
extern const char *log_file;
-void log_message(const char *fmt, ...);
+void log_message(const char *fmt, ...) PRINTFFORMAT(1, 2);
/*** from database.c ***/
diff --git a/lib/dpkg.h b/lib/dpkg.h
index d932f1a..9a0808d 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -215,7 +215,7 @@ void ohshite(const char *fmt, ...) NONRETURNING
PRINTFFORMAT(1, 2);
void ohshitvb(struct varbuf*) NONRETURNING;
void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
void werr(const char *what) NONRETURNING;
-void warningf(const char *fmt, ...);
+void warningf(const char *fmt, ...) PRINTFFORMAT(1, 2);
/*** from mlib.c ***/
@@ -341,16 +341,16 @@ struct buffer_data {
off_t buffer_copy_setup_PtrInt(void *p, int typeIn, void *procIn,
int i, int typeOut, void *procOut,
- off_t limit, const char *desc, ...);
+ off_t limit, const char *desc, ...)
PRINTFFORMAT(8, 9);
off_t buffer_copy_setup_PtrPtr(void *p1, int typeIn, void *procIn,
void *p2, int typeOut, void *procOut,
- off_t limit, const char *desc, ...);
+ off_t limit, const char *desc, ...)
PRINTFFORMAT(8, 9);
off_t buffer_copy_setup_IntPtr(int i, int typeIn, void *procIn,
void *p, int typeOut, void *procOut,
- off_t limit, const char *desc, ...);
+ off_t limit, const char *desc, ...)
PRINTFFORMAT(8, 9);
off_t buffer_copy_setup_IntInt(int i1, int typeIn, void *procIn,
int i2, int typeOut, void *procOut,
- off_t limit, const char *desc, ...);
+ off_t limit, const char *desc, ...)
PRINTFFORMAT(8, 9);
off_t buffer_copy_setup(buffer_arg argIn, int typeIn, void *procIn,
buffer_arg argOut, int typeOut, void *procOut,
off_t limit, const char *desc);
@@ -379,8 +379,11 @@ enum compress_type {
compress_type_lzma,
};
-void decompress_cat(enum compress_type type, int fd_in, int fd_out, char
*desc, ...) NONRETURNING;
-void compress_cat(enum compress_type type, int fd_in, int fd_out, const char
*compression, char *desc, ...) NONRETURNING;
+void decompress_cat(enum compress_type type, int fd_in, int fd_out,
+ char *desc, ...) NONRETURNING PRINTFFORMAT(4, 5);
+void compress_cat(enum compress_type type, int fd_in, int fd_out,
+ const char *compression, char *desc, ...)
+ NONRETURNING PRINTFFORMAT(5, 6);
/*** from compat.c ***/
commit 47d1d738543c63564f60e885d57639f6766424f5
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Wed Jan 2 06:36:00 2008 +0200
Use NONRETURNING and PRINTFFORMAT instead of NONRETURNPRINTFFORMAT attribute
diff --git a/ChangeLog b/ChangeLog
index 78edaf9..90e093a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-02 Guillem Jover <[EMAIL PROTECTED]>
+
+ * lib/dpkg.h (NONRETURNPRINTFFORMAT): Remove macro.
+ (ohshit): Use NONRETURNING and PRINTFFORMAT instead of
+ NONRETURNPRINTFFORMAT.
+ (ohshite): Likewise.
+ (badusage): Likewise.
+ * utils/start-stop-daemon.c (NONRETURNPRINTFFORMAT): Remove macro.
+ (fatal): Use NONRETURNING and PRINTFFORMAT instead of
+ NONRETURNPRINTFFORMAT.
+
2008-01-01 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-buildpackage.pl: Use Dpkg::Compression. Use $comp_regex
diff --git a/lib/dpkg.h b/lib/dpkg.h
index ff3ac9a..d932f1a 100644
--- a/lib/dpkg.h
+++ b/lib/dpkg.h
@@ -159,13 +159,11 @@ extern const char printforhelp[];
# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
# define NONRETURNING __attribute__((noreturn))
# define UNUSED __attribute__((unused))
-# define NONRETURNPRINTFFORMAT(si, tc)
__attribute__((format(printf,si,tc),noreturn))
#else
# define CONSTANT
# define PRINTFFORMAT(si, tc)
# define NONRETURNING
# define UNUSED
-# define NONRETURNPRINTFFORMAT(si, tc)
#endif
/*** from startup.c ***/
@@ -211,11 +209,11 @@ void do_internerr(const char *string, int line, const
char *file) NONRETURNING;
#define internerr(s) do_internerr(s,__LINE__,__FILE__)
struct varbuf;
-void ohshit(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void ohshit(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
void ohshitv(const char *fmt, va_list al) NONRETURNING;
-void ohshite(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void ohshite(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
void ohshitvb(struct varbuf*) NONRETURNING;
-void badusage(const char *fmt, ...) NONRETURNPRINTFFORMAT(1,2);
+void badusage(const char *fmt, ...) NONRETURNING PRINTFFORMAT(1, 2);
void werr(const char *what) NONRETURNING;
void warningf(const char *fmt, ...);
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 30bae57..e4bbc41 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -106,13 +106,11 @@
# define PRINTFFORMAT(si, tc) __attribute__((format(printf,si,tc)))
# define NONRETURNING __attribute__((noreturn))
# define UNUSED __attribute__((unused))
-# define NONRETURNPRINTFFORMAT(si, tc)
__attribute__((format(printf,si,tc),noreturn))
#else
# define CONSTANT
# define PRINTFFORMAT(si, tc)
# define NONRETURNING
# define UNUSED
-# define NONRETURNPRINTFFORMAT(si, tc)
#endif
static int testmode = 0;
@@ -180,7 +178,7 @@ static int pid_is_exec(pid_t pid, const struct stat *esb);
#ifdef __GNUC__
static void fatal(const char *format, ...)
- NONRETURNPRINTFFORMAT(1, 2);
+ NONRETURNING PRINTFFORMAT(1, 2);
static void badusage(const char *msg)
NONRETURNING;
#else
commit 73aa35745d57c6c682fe742642ce1d7639f1194e
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Tue Jan 1 21:52:00 2008 +0200
Promote bzip2 Recommends to Depends for dpkg-dev
Closes: #458521
diff --git a/debian/changelog b/debian/changelog
index df02cec..6681e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ dpkg (1.14.15) UNRELEASED; urgency=low
Thanks to Samuel Thibault.
* Properly print build message in dpkg-buildpackage for lzma and bzip2
compressed sources. Closes: #458519
+ * Promote bzip2 Recommends to Depends for dpkg-dev. Closes: #458521
[ Updated dpkg translations ]
* Norwegian Bokmål (Hans Fredrik Nordhaug). Closes: #457918
diff --git a/debian/control b/debian/control
index 431888b..284964e 100644
--- a/debian/control
+++ b/debian/control
@@ -34,9 +34,9 @@ Package: dpkg-dev
Section: utils
Priority: optional
Architecture: all
-Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2),
+Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2,
patch (>= 2.2-1), make, binutils
-Recommends: gcc | c-compiler, bzip2
+Recommends: gcc | c-compiler
Suggests: gnupg, debian-keyring
Conflicts: dpkgname, dpkg-cross (<< 2.0.0)
Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja, manpages-pl (<= 20051117-1)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
