Hej,
w zalaczniku patche do 2.8.3. Doszedl jeden patch a inne ktore trzeba
bylo to dopasowalem.
U mnie buduje sie i dziala na Titanium:
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-devel-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-dict-ldap-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-dict-mysql-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-dict-pcre-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-dict-pgsql-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/postfix-qshape-2.8.3-1.x86_64.rpm
Zapisano: /home/users/shadzik/rpm/RPMS/monit-rc-postfix-2.8.3-1.x86_64.rpm
Pozdrawiam,
b
--
"I'm living proof if you do one thing right in your career, you can
coast for a long time. A LOOOOONG time." -Guy Kawasaki
Index: packages/postfix/postfix.spec
===================================================================
RCS file: /cvsroot/packages/postfix/postfix.spec,v
retrieving revision 1.357
diff -u -r1.357 postfix.spec
--- packages/postfix/postfix.spec 16 May 2011 13:30:35 -0000 1.357
+++ packages/postfix/postfix.spec 17 May 2011 12:28:46 -0000
@@ -24,7 +24,7 @@
%bcond_without epoll # disable epoll for 2.4 kernels
%endif
-%define vda_ver 2.7.0
+%define vda_ver v10-2.8.1
Summary: Postfix Mail Transport Agent
Summary(cs.UTF-8): Postfix - program pro přepravu pošty (MTA)
Summary(es.UTF-8): Postfix - Un MTA (Mail Transport Agent) de alto desempeño
@@ -33,13 +33,13 @@
Summary(pt_BR.UTF-8): Postfix - Um MTA (Mail Transport Agent) de alto desempenho
Summary(sk.UTF-8): Agent prenosu pošty Postfix
Name: postfix
-Version: 2.7.3
-Release: 3
+Version: 2.8.3
+Release: 1
Epoch: 2
License: distributable
Group: Networking/Daemons/SMTP
Source0: ftp://ftp.porcupine.org/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
-# Source0-md5: 2bbb529b7bff25f0f38c3c0a5dcf37ca
+# Source0-md5: b3922ededd3fd6051f759e58a4ada3ae
Source1: %{name}.aliases
Source2: %{name}.cron
Source3: %{name}.init
@@ -47,7 +47,7 @@
Source5: %{name}.sasl
Source6: %{name}.pamd
Source7: http://vda.sourceforge.net/VDA/%{name}-vda-%{vda_ver}.patch
-# Source7-md5: f73d119fc9e00f31f23599176554e763
+# Source7-md5: 5d5156e51cc07057bf347bbb34934d3e
Source8: %{name}-bounce.cf.pl
# http://postfix.state-of-mind.de/bounce-templates/bounce.de-DE.cf
Source9: %{name}-bounce.cf.de
@@ -67,6 +67,7 @@
Patch8: %{name}-dictname.patch
Patch9: %{name}-make-jN.patch
Patch10: %{name}-link.patch
+Patch11: %{name}-scache_clnt.patch
URL: http://www.postfix.org/
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
BuildRequires: db-devel
@@ -276,6 +277,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%if %{with tcp}
sed -i 's/ifdef SNAPSHOT/if 1/' src/util/dict_open.c
Index: packages/postfix/postfix-dynamicmaps.patch
===================================================================
RCS file: /cvsroot/packages/postfix/postfix-dynamicmaps.patch,v
retrieving revision 1.16
diff -u -r1.16 postfix-dynamicmaps.patch
--- packages/postfix/postfix-dynamicmaps.patch 15 Apr 2010 13:52:26 -0000 1.16
+++ packages/postfix/postfix-dynamicmaps.patch 17 May 2011 12:29:10 -0000
@@ -493,26 +493,6 @@
+/*--*/
+
+#endif
-diff -dur postfix-2.1.3.orig/src/global/mail_dict.c postfix-2.1.3/src/global/mail_dict.c
---- postfix-2.1.3.orig/src/global/mail_dict.c 2004-01-04 19:53:27.000000000 +0100
-+++ postfix-2.1.3/src/global/mail_dict.c 2004-06-22 15:47:45.259202712 +0200
-@@ -45,15 +45,6 @@
-
- static DICT_OPEN_INFO dict_open_info[] = {
- DICT_TYPE_PROXY, dict_proxy_open,
--#ifdef HAS_LDAP
-- DICT_TYPE_LDAP, dict_ldap_open,
--#endif
--#ifdef HAS_MYSQL
-- DICT_TYPE_MYSQL, dict_mysql_open,
--#endif
--#ifdef HAS_PGSQL
-- DICT_TYPE_PGSQL, dict_pgsql_open,
--#endif
- 0,
- };
-
-
--- postfix-2.0.16.orig/conf/dynamicmaps.cf 1970-01-01 01:00:00.000000000 +0100
+++ postfix-2.0.16/conf/dynamicmaps.cf 2003-11-08 19:52:14.000000000 +0100
@@ -0,0 +1,9 @@
@@ -583,29 +563,85 @@
/* mail_params_init - configure built-in parameters */
void mail_params_init()
---- postfix-2.3.0/src/global/Makefile.in 2006-07-17 03:28:25.732653648 +0200
-+++ postfix-2.3.0/src/global/Makefile.in-new 2006-07-17 03:29:31.805609032 +0200
-@@ -32,7 +32,7 @@
+diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
+--- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 15:38:57.190461088 +0200
++++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 15:39:24.255859620 +0200
+@@ -700,6 +700,7 @@
+ #define STATFS_IN_SYS_VFS_H
+ #define PREPEND_PLUS_TO_OPTSTRING
+ #define HAS_POSIX_REGEXP
++#define HAS_DLOPEN
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+ #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+@@ -754,6 +755,7 @@
+ #define STATFS_IN_SYS_VFS_H
+ #define PREPEND_PLUS_TO_OPTSTRING
+ #define HAS_POSIX_REGEXP
++#define HAS_DLOPEN
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+ #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+@@ -638,6 +640,7 @@
+ #define USE_STATFS
+ #define STATFS_IN_SYS_VFS_H
+ #define HAS_POSIX_REGEXP
++#define HAS_SHL_LOAD
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+ #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+@@ -673,6 +676,7 @@
+ #define USE_STATFS
+ #define STATFS_IN_SYS_VFS_H
+ #define HAS_POSIX_REGEXP
++#define HAS_SHL_LOAD
+ #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
+ #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
+ #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
+--- postfix-2.8.3/src/global/mail_dict.c.orig 2011-05-17 14:02:59.140062944 +0200
++++ postfix-2.8.3/src/global/mail_dict.c 2011-05-17 14:05:36.102812189 +0200
+@@ -46,18 +46,6 @@
+
+ static const DICT_OPEN_INFO dict_open_info[] = {
+ DICT_TYPE_PROXY, dict_proxy_open,
+-#ifdef HAS_LDAP
+- DICT_TYPE_LDAP, dict_ldap_open,
+-#endif
+-#ifdef HAS_MYSQL
+- DICT_TYPE_MYSQL, dict_mysql_open,
+-#endif
+-#ifdef HAS_PGSQL
+- DICT_TYPE_PGSQL, dict_pgsql_open,
+-#endif
+-#ifdef HAS_SQLITE
+- DICT_TYPE_SQLITE, dict_sqlite_open,
+-#endif
+ 0,
+ };
+
+--- postfix-2.8.3/src/global/Makefile.in.orig 2011-05-17 14:02:59.937097645 +0200
++++ postfix-2.8.3/src/global/Makefile.in 2011-05-17 14:06:13.610608277 +0200
+@@ -35,7 +35,7 @@
canon_addr.o cfg_parser.o cleanup_strerror.o cleanup_strflags.o \
clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
- deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \
+ deliver_request.o \
- dict_proxy.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
+ dict_proxy.o dict_sqlite.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \
ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
---- postfix-2.6.1/src/util/Makefile.in.orig 2009-05-25 19:21:45.370180069 +0200
-+++ postfix-2.6.1/src/util/Makefile.in 2009-05-25 19:25:49.971166764 +0200
+--- postfix-2.8.3/src/util/Makefile.in.orig 2011-05-17 14:02:59.633270630 +0200
++++ postfix-2.8.3/src/util/Makefile.in 2011-05-17 14:08:00.025813783 +0200
@@ -30,7 +30,7 @@
username.c valid_hostname.c vbuf.c vbuf_print.c vstream.c \
vstream_popen.c vstring.c vstring_vstream.c watchdog.c writable.c \
write_buf.c write_wait.c sane_basename.c format_tv.c allspace.c \
-- allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c \
-+ allascii.c load_file.c killme_after.c vstream_tweak.c upass_connect.c load_lib.c \
- upass_listen.c upass_trigger.c edit_file.c inet_windowsize.c \
- unix_pass_fd_fix.c dict_cache.c
- OBJS = alldig.o allprint.o argv.o argv_split.o attr_clnt.o attr_print0.o \
-@@ -38,7 +38,7 @@
+- allascii.c load_file.c killme_after.c vstream_tweak.c \
++ allascii.c load_file.c killme_after.c vstream_tweak.c load_lib.c \
+ unix_pass_listen.c unix_pass_trigger.c edit_file.c inet_windowsize.c \
+ unix_pass_fd_fix.c dict_cache.c valid_utf_8.c dict_thash.c \
+ ip_match.c nbbio.c stream_pass_connect.c
+@@ -40,7 +40,7 @@
chroot_uid.o cidr_match.o clean_env.o close_on_exec.o concatenate.o \
ctable.o dict.o dict_alloc.o dict_cdb.o dict_cidr.o dict_db.o \
dict_dbm.o dict_debug.o dict_env.o dict_ht.o dict_ni.o dict_nis.o \
@@ -614,25 +650,25 @@
dict_static.o dict_tcp.o dict_unix.o dir_forest.o doze.o dummy_read.o \
dummy_write.o duplex_pipe.o environ.o events.o exec_command.o \
fifo_listen.o fifo_trigger.o file_limit.o find_inet.o fsspace.o \
-@@ -63,7 +63,7 @@
+@@ -65,7 +65,7 @@
username.o valid_hostname.o vbuf.o vbuf_print.o vstream.o \
vstream_popen.o vstring.o vstring_vstream.o watchdog.o writable.o \
write_buf.o write_wait.o sane_basename.o format_tv.o allspace.o \
-- allascii.o load_file.o killme_after.o vstream_tweak.o upass_connect.o \
-+ allascii.o load_file.o killme_after.o vstream_tweak.o upass_connect.o load_lib.o \
- upass_listen.o upass_trigger.o edit_file.o inet_windowsize.o \
- unix_pass_fd_fix.o dict_cache.o
- HDRS = argv.h attr.h attr_clnt.h auto_clnt.h base64_code.h binhash.h \
-@@ -83,7 +83,7 @@
- sigdelay.h sock_addr.h spawn_command.h split_at.h stat_as.h \
+- allascii.o load_file.o killme_after.o vstream_tweak.o \
++ allascii.o load_file.o killme_after.o vstream_tweak.o load_lib.o \
+ unix_pass_listen.o unix_pass_trigger.o edit_file.o inet_windowsize.o \
+ unix_pass_fd_fix.o dict_cache.o valid_utf_8.o dict_thash.o \
+ ip_match.o nbbio.o stream_pass_connect.o
+@@ -88,7 +88,7 @@
stringops.h sys_defs.h timed_connect.h timed_wait.h trigger.h \
username.h valid_hostname.h vbuf.h vbuf_print.h vstream.h vstring.h \
-- vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h \
-+ vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h load_lib.h \
- edit_file.h dict_cache.h
+ vstring_vstream.h watchdog.h format_tv.h load_file.h killme_after.h \
+- edit_file.h dict_cache.h dict_thash.h \
++ edit_file.h dict_cache.h dict_thash.h load_lib.h \
+ ip_match.h nbbio.h
TESTSRC = fifo_open.c fifo_rdwr_bug.c fifo_rdonly_bug.c select_bug.c \
- stream_test.c dup2_pass_on_exec.c test_send_fd test_recv_fd
-@@ -91,6 +91,7 @@
+ stream_test.c dup2_pass_on_exec.c
+@@ -96,6 +96,7 @@
CFLAGS = $(DEBUG) $(OPT) $(DEFS)
FILES = Makefile $(SRCS) $(HDRS)
INCL =
@@ -640,7 +676,7 @@
LIB = libutil.a
TESTPROG= dict_open dup2_pass_on_exec events exec_command fifo_open \
fifo_rdonly_bug fifo_rdwr_bug fifo_trigger fsspace fullname \
-@@ -105,8 +106,9 @@
+@@ -111,8 +112,9 @@
LIB_DIR = ../../lib
INC_DIR = ../../include
@@ -651,7 +687,7 @@
all: $(LIB)
-@@ -117,15 +119,19 @@
+@@ -123,15 +125,19 @@
test: $(TESTPROG)
@@ -675,8 +711,8 @@
-for i in $(HDRS); \
do \
cmp -s $$i $(INC_DIR)/$$i 2>/dev/null || cp $$i $(INC_DIR); \
-@@ -147,7 +153,8 @@
- lint $(SRCS)
+@@ -153,7 +159,8 @@
+ lint $(DEFS) $(SRCS) $(LINTFIX)
clean:
- rm -f *.o $(LIB) *core $(TESTPROG) junk $(MAKES) *.tmp
@@ -685,38 +721,3 @@
rm -rf printfck
tidy: clean
-diff -durN postfix-2.1.3.orig/src/util/sys_defs.h postfix-2.1.3/src/util/sys_defs.h
---- postfix-2.1.3.orig/src/util/sys_defs.h 2004-06-22 15:38:57.190461088 +0200
-+++ postfix-2.1.3/src/util/sys_defs.h 2004-06-22 15:39:24.255859620 +0200
-@@ -700,6 +700,7 @@
- #define STATFS_IN_SYS_VFS_H
- #define PREPEND_PLUS_TO_OPTSTRING
- #define HAS_POSIX_REGEXP
-+#define HAS_DLOPEN
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
- #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -754,6 +755,7 @@
- #define STATFS_IN_SYS_VFS_H
- #define PREPEND_PLUS_TO_OPTSTRING
- #define HAS_POSIX_REGEXP
-+#define HAS_DLOPEN
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
- #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -638,6 +640,7 @@
- #define USE_STATFS
- #define STATFS_IN_SYS_VFS_H
- #define HAS_POSIX_REGEXP
-+#define HAS_SHL_LOAD
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
- #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
-@@ -673,6 +676,7 @@
- #define USE_STATFS
- #define STATFS_IN_SYS_VFS_H
- #define HAS_POSIX_REGEXP
-+#define HAS_SHL_LOAD
- #define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define NATIVE_MAILQ_PATH "/usr/bin/mailq"
- #define NATIVE_NEWALIAS_PATH "/usr/bin/newaliases"
Index: packages/postfix/postfix-ident.patch
===================================================================
RCS file: /cvsroot/packages/postfix/postfix-ident.patch,v
retrieving revision 1.7
diff -u -r1.7 postfix-ident.patch
--- packages/postfix/postfix-ident.patch 15 Apr 2010 15:31:03 -0000 1.7
+++ packages/postfix/postfix-ident.patch 17 May 2011 12:29:33 -0000
@@ -153,21 +153,6 @@
+ return_val = mystrdup(ident_user);
+ return return_val;
+}
---- postfix-2.6.1/src/smtpd/Makefile.in.orig 2009-05-25 19:34:22.326563111 +0200
-+++ postfix-2.6.1/src/smtpd/Makefile.in 2009-05-25 19:40:29.642775958 +0200
-@@ -1,10 +1,10 @@
- SHELL = /bin/sh
- SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
- smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
-- smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c
-+ smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c smtpd_ident.c
- OBJS = smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \
- smtpd_peer.o smtpd_sasl_proto.o smtpd_sasl_glue.o smtpd_proxy.o \
-- smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o
-+ smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o smtpd_ident.o
- HDRS = smtpd_token.h smtpd_check.h smtpd_chat.h smtpd_sasl_proto.h \
- smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h \
- smtpd_resolve.h
--- postfix-2.3-RC9/src/smtpd/smtpd.c.orig 2006-07-11 20:13:27.780850288 +0200
+++ postfix-2.3-RC9/src/smtpd/smtpd.c 2006-07-11 20:27:06.515383720 +0200
@@ -1024,6 +1024,7 @@
@@ -341,3 +326,19 @@
+ myfree(state->ident_user);
myfree(state->port);
}
+--- postfix-2.8.3/src/smtpd/Makefile.in.orig 2011-05-17 14:12:29.015772783 +0200
++++ postfix-2.8.3/src/smtpd/Makefile.in 2011-05-17 14:15:33.575768604 +0200
+@@ -1,11 +1,11 @@
+ SHELL = /bin/sh
+ SRCS = smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c \
+ smtpd_peer.c smtpd_sasl_proto.c smtpd_sasl_glue.c smtpd_proxy.c \
+- smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c \
++ smtpd_xforward.c smtpd_dsn_fix.c smtpd_milter.c smtpd_resolve.c smtpd_ident.c \
+ smtpd_expand.c
+ OBJS = smtpd.o smtpd_token.o smtpd_check.o smtpd_chat.o smtpd_state.o \
+ smtpd_peer.o smtpd_sasl_proto.o smtpd_sasl_glue.o smtpd_proxy.o \
+- smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o \
++ smtpd_xforward.o smtpd_dsn_fix.o smtpd_milter.o smtpd_resolve.o smtpd_ident.o \
+ smtpd_expand.o
+ HDRS = smtpd_token.h smtpd_check.h smtpd_chat.h smtpd_sasl_proto.h \
+ smtpd_sasl_glue.h smtpd_proxy.h smtpd_dsn_fix.h smtpd_milter.h \
--- postfix-2.8.3/src/global/scache_clnt.c.orig 2011-05-17 14:24:55.245798704 +0200
+++ postfix-2.8.3/src/global/scache_clnt.c 2011-05-17 14:24:26.382381790 +0200
@@ -414,7 +414,7 @@
sp->scache->size = scache_clnt_size;
sp->scache->free = scache_clnt_free;
- service = concatenate("local:private/", server, (char *) 0);
+ service = concatenate("local:private/", var_scache_service, (char *) 0);
sp->auto_clnt = auto_clnt_create(service, timeout, idle_limit, ttl_limit);
myfree(service);
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
