From 9b971e47629b02d7e3b4ce52defb7e9df03c4959 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 28 Aug 2008 21:32:32 +0000 Subject: [PATCH] fix license tag --- postfix-2.1.1-config.patch | 22 ++++--- postfix-2.4.5-open_define.patch | 112 ++++++++++++++++---------------- postfix.spec | 7 +- 3 files changed, 73 insertions(+), 68 deletions(-) diff --git a/postfix-2.1.1-config.patch b/postfix-2.1.1-config.patch index 253793c..a343d21 100644 --- a/postfix-2.1.1-config.patch +++ b/postfix-2.1.1-config.patch @@ -1,6 +1,7 @@ ---- postfix-2.1.1/conf/main.cf.config 2004-04-15 15:27:21.000000000 +0200 -+++ postfix-2.1.1/conf/main.cf 2004-05-24 17:48:09.621348587 +0200 -@@ -106,6 +106,7 @@ +diff -up postfix-2.5.1/conf/main.cf.config postfix-2.5.1/conf/main.cf +--- postfix-2.5.1/conf/main.cf.config 2007-12-18 08:50:25.000000000 -0500 ++++ postfix-2.5.1/conf/main.cf 2008-08-28 17:22:21.000000000 -0400 +@@ -113,6 +113,7 @@ mail_owner = postfix #inet_interfaces = all #inet_interfaces = $myhostname #inet_interfaces = $myhostname, localhost @@ -8,7 +9,7 @@ # The proxy_interfaces parameter specifies the network interface # addresses that this mail system receives mail on by way of a -@@ -150,7 +151,7 @@ +@@ -157,7 +158,7 @@ mail_owner = postfix # # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS". # @@ -17,7 +18,7 @@ #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain, # mail.$mydomain, www.$mydomain, ftp.$mydomain -@@ -372,7 +373,7 @@ +@@ -379,7 +380,7 @@ unknown_local_recipient_reject_code = 55 # "postfix reload" to eliminate the delay. # #alias_maps = dbm:/etc/aliases @@ -26,9 +27,10 @@ #alias_maps = hash:/etc/aliases, nis:mail.aliases #alias_maps = netinfo:/aliases ---- postfix-2.1.1/conf/postfix-files.config 2004-05-24 17:29:30.002936514 +0200 -+++ postfix-2.1.1/conf/postfix-files 2004-05-24 17:50:24.548253843 +0200 -@@ -118,8 +118,8 @@ +diff -up postfix-2.5.1/conf/postfix-files.config postfix-2.5.1/conf/postfix-files +--- postfix-2.5.1/conf/postfix-files.config 2008-01-23 19:13:49.000000000 -0500 ++++ postfix-2.5.1/conf/postfix-files 2008-08-28 17:24:37.000000000 -0400 +@@ -128,8 +128,8 @@ $config_directory/postfix-script:f:root: $config_directory/postfix-script-sgid:f:root:-:755:o $config_directory/postfix-script-nosgid:f:root:-:755:o $config_directory/post-install:f:root:-:755 @@ -39,7 +41,7 @@ $manpage_directory/man1/postalias.1:f:root:-:644 $manpage_directory/man1/postcat.1:f:root:-:644 $manpage_directory/man1/postconf.1:f:root:-:644 -@@ -131,9 +131,9 @@ +@@ -141,9 +141,9 @@ $manpage_directory/man1/postlog.1:f:root $manpage_directory/man1/postmap.1:f:root:-:644 $manpage_directory/man1/postqueue.1:f:root:-:644 $manpage_directory/man1/postsuper.1:f:root:-:644 @@ -49,5 +51,5 @@ -$manpage_directory/man5/aliases.5:f:root:-:644 +$manpage_directory/man5/aliases.postfix.5:f:root:-:644 $manpage_directory/man5/body_checks.5:f:root:-:644 + $manpage_directory/man5/bounce.5:f:root:-:644 $manpage_directory/man5/canonical.5:f:root:-:644 - $manpage_directory/man5/cidr_table.5:f:root:-:644 diff --git a/postfix-2.4.5-open_define.patch b/postfix-2.4.5-open_define.patch index 5ea894e..8777ce7 100644 --- a/postfix-2.4.5-open_define.patch +++ b/postfix-2.4.5-open_define.patch @@ -1,27 +1,40 @@ -diff -up postfix-2.4.5/src/util/dict_open.c.open_define postfix-2.4.5/src/util/dict_open.c ---- postfix-2.4.5/src/util/dict_open.c.open_define 2006-06-26 14:59:19.000000000 +0200 -+++ postfix-2.4.5/src/util/dict_open.c 2007-08-13 18:46:18.000000000 +0200 -@@ -302,7 +302,7 @@ DICT *dict_open3(const char *dict_type - dict_open_init(); - if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) - msg_fatal("unsupported dictionary type: %s", dict_type); -- if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) -+ if ((dict = (dp->open)(dict_name, open_flags, dict_flags)) == 0) - msg_fatal("opening %s:%s %m", dict_type, dict_name); - if (msg_verbose) - msg_info("%s: %s:%s", myname, dict_type, dict_name); -@@ -323,7 +323,7 @@ void dict_open_register(const char *t - msg_panic("%s: dictionary type exists: %s", myname, type); - dp = (DICT_OPEN_INFO *) mymalloc(sizeof(*dp)); - dp->type = mystrdup(type); -- dp->open = open; -+ (dp->open) = open; - htable_enter(dict_open_hash, dp->type, (char *) dp); - } +diff -up postfix-2.5.1/src/global/mail_dict.c.open_define postfix-2.5.1/src/global/mail_dict.c +--- postfix-2.5.1/src/global/mail_dict.c.open_define 2008-01-08 16:07:47.000000000 -0500 ++++ postfix-2.5.1/src/global/mail_dict.c 2008-08-28 17:26:30.000000000 -0400 +@@ -64,5 +64,5 @@ void mail_dict_init(void) + const DICT_OPEN_INFO *dp; -diff -up postfix-2.4.5/src/util/dict_db.c.open_define postfix-2.4.5/src/util/dict_db.c ---- postfix-2.4.5/src/util/dict_db.c.open_define 2007-01-04 15:06:07.000000000 +0100 -+++ postfix-2.4.5/src/util/dict_db.c 2007-08-13 18:46:18.000000000 +0200 + for (dp = dict_open_info; dp->type; dp++) +- dict_open_register(dp->type, dp->open); ++ dict_open_register(dp->type, (dp->open)); + } +diff -up postfix-2.5.1/src/global/mkmap_cdb.c.open_define postfix-2.5.1/src/global/mkmap_cdb.c +--- postfix-2.5.1/src/global/mkmap_cdb.c.open_define 2004-12-08 18:58:05.000000000 -0500 ++++ postfix-2.5.1/src/global/mkmap_cdb.c 2008-08-28 17:25:23.000000000 -0400 +@@ -56,7 +56,7 @@ + MKMAP *mkmap_cdb_open(const char *unused_path) + { + MKMAP *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap)); +- mkmap->open = dict_cdb_open; ++ (mkmap->open) = dict_cdb_open; + mkmap->after_open = 0; + mkmap->after_close = 0; + return (mkmap); +diff -up postfix-2.5.1/src/global/mkmap_open.c.open_define postfix-2.5.1/src/global/mkmap_open.c +--- postfix-2.5.1/src/global/mkmap_open.c.open_define 2008-01-08 17:08:45.000000000 -0500 ++++ postfix-2.5.1/src/global/mkmap_open.c 2008-08-28 17:25:23.000000000 -0400 +@@ -181,7 +181,7 @@ MKMAP *mkmap_open(const char *type, con + * Truncate the database upon open, and update it. Read-write mode is + * needed because the underlying routines read as well as write. + */ +- mkmap->dict = mkmap->open(path, open_flags, dict_flags); ++ mkmap->dict = (mkmap->open)(path, open_flags, dict_flags); + mkmap->dict->lock_fd = -1; /* XXX just in case */ + mkmap->dict->stat_fd = -1; /* XXX just in case */ + mkmap->dict->flags |= DICT_FLAG_DUP_WARN; +diff -up postfix-2.5.1/src/util/dict_db.c.open_define postfix-2.5.1/src/util/dict_db.c +--- postfix-2.5.1/src/util/dict_db.c.open_define 2007-01-04 09:06:07.000000000 -0500 ++++ postfix-2.5.1/src/util/dict_db.c 2008-08-28 17:25:23.000000000 -0400 @@ -665,10 +665,10 @@ static DICT *dict_db_open(const char *cl if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0) msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM); @@ -35,37 +48,24 @@ diff -up postfix-2.4.5/src/util/dict_db.c.open_define postfix-2.4.5/src/util/dic msg_fatal("open database %s: %m", db_path); #else #error "Unsupported Berkeley DB version" -diff -up postfix-2.4.5/src/global/mkmap_open.c.open_define postfix-2.4.5/src/global/mkmap_open.c ---- postfix-2.4.5/src/global/mkmap_open.c.open_define 2004-12-15 01:24:22.000000000 +0100 -+++ postfix-2.4.5/src/global/mkmap_open.c 2007-08-13 18:46:18.000000000 +0200 -@@ -177,7 +177,7 @@ MKMAP *mkmap_open(const char *type, con - * Truncate the database upon open, and update it. Read-write mode is - * needed because the underlying routines read as well as write. - */ -- mkmap->dict = mkmap->open(path, open_flags, dict_flags); -+ mkmap->dict = (mkmap->open)(path, open_flags, dict_flags); - mkmap->dict->lock_fd = -1; /* XXX just in case */ - mkmap->dict->stat_fd = -1; /* XXX just in case */ - mkmap->dict->flags |= DICT_FLAG_DUP_WARN; -diff -up postfix-2.4.5/src/global/mkmap_cdb.c.open_define postfix-2.4.5/src/global/mkmap_cdb.c ---- postfix-2.4.5/src/global/mkmap_cdb.c.open_define 2004-12-09 00:58:05.000000000 +0100 -+++ postfix-2.4.5/src/global/mkmap_cdb.c 2007-08-13 18:46:18.000000000 +0200 -@@ -56,7 +56,7 @@ - MKMAP *mkmap_cdb_open(const char *unused_path) - { - MKMAP *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap)); -- mkmap->open = dict_cdb_open; -+ (mkmap->open) = dict_cdb_open; - mkmap->after_open = 0; - mkmap->after_close = 0; - return (mkmap); -diff -up postfix-2.4.5/src/global/mail_dict.c.open_define postfix-2.4.5/src/global/mail_dict.c ---- postfix-2.4.5/src/global/mail_dict.c.open_define 2004-01-04 19:53:27.000000000 +0100 -+++ postfix-2.4.5/src/global/mail_dict.c 2007-08-13 18:46:18.000000000 +0200 -@@ -64,5 +64,5 @@ void mail_dict_init(void) - DICT_OPEN_INFO *dp; - - for (dp = dict_open_info; dp->type; dp++) -- dict_open_register(dp->type, dp->open); -+ dict_open_register(dp->type, (dp->open)); +diff -up postfix-2.5.1/src/util/dict_open.c.open_define postfix-2.5.1/src/util/dict_open.c +--- postfix-2.5.1/src/util/dict_open.c.open_define 2008-01-08 16:05:20.000000000 -0500 ++++ postfix-2.5.1/src/util/dict_open.c 2008-08-28 17:25:23.000000000 -0400 +@@ -305,7 +305,7 @@ DICT *dict_open3(const char *dict_type + dict_open_init(); + if ((dp = (DICT_OPEN_INFO *) htable_find(dict_open_hash, dict_type)) == 0) + msg_fatal("unsupported dictionary type: %s", dict_type); +- if ((dict = dp->open(dict_name, open_flags, dict_flags)) == 0) ++ if ((dict = (dp->open)(dict_name, open_flags, dict_flags)) == 0) + msg_fatal("opening %s:%s %m", dict_type, dict_name); + if (msg_verbose) + msg_info("%s: %s:%s", myname, dict_type, dict_name); +@@ -326,7 +326,7 @@ void dict_open_register(const char *t + msg_panic("%s: dictionary type exists: %s", myname, type); + dp = (DICT_OPEN_INFO *) mymalloc(sizeof(*dp)); + dp->type = mystrdup(type); +- dp->open = open; ++ (dp->open) = open; + htable_enter(dict_open_hash, dp->type, (char *) dp); } + diff --git a/postfix.spec b/postfix.spec index 6fedbc2..b16687c 100644 --- a/postfix.spec +++ b/postfix.spec @@ -40,11 +40,11 @@ Name: postfix Summary: Postfix Mail Transport Agent Version: 2.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 2 Group: System Environment/Daemons URL: http://www.postfix.org -License: IBM Public License +License: IBM Requires(post): /sbin/chkconfig Requires(post): %{_sbindir}/alternatives Requires(pre): %{_sbindir}/groupadd @@ -482,6 +482,9 @@ exit 0 %changelog +* Thu Aug 28 2008 Tom "spot" Callaway 2:2.5.1-4 +- fix license tag + * Thu Aug 14 2008 Thomas Woerner 2:2.5.1-3 - fixed postfix privilege problem with symlinks in the mail spool directory (CVE-2008-2936) (rhbz#459101)