OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 19-Sep-2003 09:53:45
Branch: HEAD Handle: 2003091908534500
Modified files:
openpkg-src/sendmail sendmail.patch sendmail.spec
Log:
simplify packaging by reducing the number of required subshells
Summary:
Revision Changes Path
1.2 +4 -4 openpkg-src/sendmail/sendmail.patch
1.99 +112 -128 openpkg-src/sendmail/sendmail.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 sendmail.patch
--- openpkg-src/sendmail/sendmail.patch 4 Jul 2003 14:31:32 -0000 1.1
+++ openpkg-src/sendmail/sendmail.patch 19 Sep 2003 07:53:45 -0000 1.2
@@ -1,5 +1,5 @@
---- sendmail-8.12.0/sendmail/conf.c.orig Tue Oct 16 11:24:13 2001
-+++ sendmail-8.12.0/sendmail/conf.c Wed Oct 17 18:49:33 2001
+--- sendmail/conf.c.orig Tue Oct 16 11:24:13 2001
++++ sendmail/conf.c Wed Oct 17 18:49:33 2001
@@ -470,6 +470,12 @@
ndbm_map_lookup, ndbm_map_store);
#endif /* NDBM */
@@ -23,8 +23,8 @@
#if NETINET
"NETINET",
#endif /* NETINET */
---- sendmail-8.12.0/sendmail/map.c.orig Tue Oct 16 11:22:26 2001
-+++ sendmail-8.12.0/sendmail/map.c Thu Oct 18 09:34:53 2001
+--- sendmail/map.c.orig Tue Oct 16 11:22:26 2001
++++ sendmail/map.c Thu Oct 18 09:34:53 2001
@@ -1822,12 +1822,443 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.98 -r1.99 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 19 Sep 2003 07:38:17 -0000 1.98
+++ openpkg-src/sendmail/sendmail.spec 19 Sep 2003 07:53:45 -0000 1.99
@@ -91,126 +91,112 @@
%prep
# unpack standard tarballs
- %setup0 -q -c
- %setup1 -q -T -D -a 1
-
- # apply patches for MySQL map support
- ( cd sendmail-%{version}
- %{l_patch} -p1 <%{PATCH sendmail.patch}
- ) || exit $?
+ %setup -q
+ %setup -q -D -T -a 1
+ %patch -p0
# make install process unprivileged
- ( cd sendmail-%{version}
- %{l_shtool} subst \
- -e 's;ln -s *;$(LN) $(LNOPTS) $(DESTDIR);' \
- -e 's;chown;true;g' \
- -e 's;chgrp;true;g' \
- Makefile */Makefile */Makefile.m4 */*/Makefile
- %{l_shtool} subst \
- -e 's;\$chown;true;g' \
- -e 's;chgrp;true;g' \
- -e 's;chmod;true;g' \
- devtools/bin/install.sh
- ) || exit $?
+ %{l_shtool} subst \
+ -e 's;ln -s *;$(LN) $(LNOPTS) $(DESTDIR);' \
+ -e 's;chown;true;g' \
+ -e 's;chgrp;true;g' \
+ Makefile */Makefile */Makefile.m4 */*/Makefile
+ %{l_shtool} subst \
+ -e 's;\$chown;true;g' \
+ -e 's;chgrp;true;g' \
+ -e 's;chmod;true;g' \
+ devtools/bin/install.sh
# add own M4 stuff to Sendmail configuration set
- ( cd sendmail-%{version}
- %{l_tar} xf %{SOURCE cf.tar}
- ) || exit $?
+ %{l_tar} xf %{SOURCE cf.tar}
# override platform-specific definitions
- ( cd sendmail-%{version}
- ( echo "#ifdef _PATH_SENDMAIL"
- echo "#undef _PATH_SENDMAIL"
- echo "#endif"
- ) >sed.include
- %{l_shtool} subst \
+ ( echo "#ifdef _PATH_SENDMAIL"
+ echo "#undef _PATH_SENDMAIL"
+ echo "#endif"
+ ) >sed.include
+ %{l_shtool} subst \
-e 's;\(define *SMRSH_CMDDIR *\).*;\1 "%{l_prefix}/var/sendmail/sm.bin";g' \
-e 's;\(define *_PATH_SENDMAIL *\).*;\1 "%{l_prefix}/sbin/sendmail";g' \
-e '/# *include *<paths.h>.*/r sed.include' \
-e '/undef *_PATH_SENDMAILPID/d' \
include/sendmail/pathnames.h include/sm/conf.h
- rm -f sed.include
- ) || exit $?
+ rm -f sed.include
%build
- # build Sendmail
- ( cd sendmail-%{version}
-
- # indicate with a plus sign that we use a patched version
- %{l_shtool} subst \
- -e 's;\(Version\[\][^"]*\)"[^"]*";\1"%{version}+";' \
- sendmail/version.c
-
- # configure Sendmail
- ( echo "define(\`confMAPDEF', \`-DMAP_REGEX')dnl"
- echo "define(\`confSBINOWN', \`%{l_musr}')dnl"
- echo "define(\`confSBINGRP', \`%{l_mgrp}')dnl"
- echo "define(\`confUBINOWN', \`%{l_musr}')dnl"
- echo "define(\`confUBINGRP', \`%{l_mgrp}')dnl"
- echo "define(\`confMANOWN', \`%{l_musr}')dnl"
- echo "define(\`confMANGRP', \`%{l_mgrp}')dnl"
- echo "define(\`confEBINDIR', \`%{l_prefix}/libexec/sendmail')dnl"
- echo "define(\`confHFDIR', \`%{l_prefix}/etc/sendmail')dnl"
- echo "define(\`confHFFILE', \`sendmail.help')dnl"
- echo "define(\`confINCLUDEDIR', \`%{l_prefix}/include/sendmail')dnl"
- echo "define(\`confINSTALL_RAWMAN', \`1')dnl"
- echo "define(\`confLIBDIR', \`%{l_prefix}/lib/sendmail')dnl"
- echo "define(\`confMANROOT', \`%{l_prefix}/man/cat')dnl"
- echo "define(\`confMANROOTMAN', \`%{l_prefix}/man/man')dnl"
- echo "define(\`confMBINDIR', \`%{l_prefix}/sbin')dnl"
- echo "define(\`confSBINDIR', \`%{l_prefix}/sbin')dnl"
- echo "define(\`confSHAREDLIBDIR', \`%{l_prefix}/lib')dnl"
- echo "define(\`confSTDIR', \`%{l_prefix}/var/sendmail')dnl"
- echo "define(\`confSTFILE', \`sendmail.stat')dnl"
- echo "define(\`confUBINDIR', \`%{l_prefix}/bin')dnl"
- echo "define(\`confLNOPTS', \`-f')dnl"
- echo "define(\`confFORCE_RMAIL', \`yes')dnl"
- echo
"APPENDDEF(\`confMSP_QUEUE_DIR',\`%{l_prefix}/var/sendmail/clientmqueue')dnl"
- echo "APPENDDEF(\`confENVDEF',
\`-D_PATH_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/sendmail.cf\\\"')dnl"
- echo "APPENDDEF(\`confENVDEF',
\`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl"
- echo "APPENDDEF(\`confENVDEF',
\`-D_DIR_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/\\\"')dnl"
- echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
- echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags}')dnl"
- echo "APPENDDEF(\`confLIBDIRS', \`%{l_ldflags}')dnl"
- echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
- echo "define(\`confSTDIO_TYPE', \`portable')dnl"
- echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
+ # indicate with a plus sign that we use a patched version
+ %{l_shtool} subst \
+ -e 's;\(Version\[\][^"]*\)"[^"]*";\1"%{version}+";' \
+ sendmail/version.c
+
+ # configure Sendmail
+ ( echo "define(\`confMAPDEF', \`-DMAP_REGEX')dnl"
+ echo "define(\`confSBINOWN', \`%{l_musr}')dnl"
+ echo "define(\`confSBINGRP', \`%{l_mgrp}')dnl"
+ echo "define(\`confUBINOWN', \`%{l_musr}')dnl"
+ echo "define(\`confUBINGRP', \`%{l_mgrp}')dnl"
+ echo "define(\`confMANOWN', \`%{l_musr}')dnl"
+ echo "define(\`confMANGRP', \`%{l_mgrp}')dnl"
+ echo "define(\`confEBINDIR', \`%{l_prefix}/libexec/sendmail')dnl"
+ echo "define(\`confHFDIR', \`%{l_prefix}/etc/sendmail')dnl"
+ echo "define(\`confHFFILE', \`sendmail.help')dnl"
+ echo "define(\`confINCLUDEDIR', \`%{l_prefix}/include/sendmail')dnl"
+ echo "define(\`confINSTALL_RAWMAN', \`1')dnl"
+ echo "define(\`confLIBDIR', \`%{l_prefix}/lib/sendmail')dnl"
+ echo "define(\`confMANROOT', \`%{l_prefix}/man/cat')dnl"
+ echo "define(\`confMANROOTMAN', \`%{l_prefix}/man/man')dnl"
+ echo "define(\`confMBINDIR', \`%{l_prefix}/sbin')dnl"
+ echo "define(\`confSBINDIR', \`%{l_prefix}/sbin')dnl"
+ echo "define(\`confSHAREDLIBDIR', \`%{l_prefix}/lib')dnl"
+ echo "define(\`confSTDIR', \`%{l_prefix}/var/sendmail')dnl"
+ echo "define(\`confSTFILE', \`sendmail.stat')dnl"
+ echo "define(\`confUBINDIR', \`%{l_prefix}/bin')dnl"
+ echo "define(\`confLNOPTS', \`-f')dnl"
+ echo "define(\`confFORCE_RMAIL', \`yes')dnl"
+ echo
"APPENDDEF(\`confMSP_QUEUE_DIR',\`%{l_prefix}/var/sendmail/clientmqueue')dnl"
+ echo "APPENDDEF(\`confENVDEF',
\`-D_PATH_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/sendmail.cf\\\"')dnl"
+ echo "APPENDDEF(\`confENVDEF',
\`-D_PATH_SENDMAILPID=\\\"%{l_prefix}/var/sendmail/sendmail.pid\\\"')dnl"
+ echo "APPENDDEF(\`confENVDEF',
\`-D_DIR_SENDMAILCF=\\\"%{l_prefix}/etc/sendmail/\\\"')dnl"
+ echo "APPENDDEF(\`confENVDEF', \`-DNEWDB')dnl"
+ echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags}')dnl"
+ echo "APPENDDEF(\`confLIBDIRS', \`%{l_ldflags}')dnl"
+ echo "APPENDDEF(\`confLIBS', \`%{l_fsl_libs} -ldb')dnl"
+ echo "define(\`confSTDIO_TYPE', \`portable')dnl"
+ echo "APPENDDEF(\`confENVDEF', \`-DDNSMAP')dnl"
%if "%{with_tls}" == "yes"
- echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl"
- echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl"
+ echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DSTARTTLS')dnl"
+ echo "APPENDDEF(\`conf_sendmail_LIBS', \`-lssl -lcrypto')dnl"
%endif
%if "%{with_sasl}" == "yes"
- echo "APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl"
- echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags sasl .}')dnl"
- echo "APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl"
+ echo "APPENDDEF(\`confENVDEF', \`-DSASL=1')dnl"
+ echo "APPENDDEF(\`confINCDIRS', \`%{l_cppflags sasl .}')dnl"
+ echo "APPENDDEF(\`confLIBS', \`-lsasl2 -lcrypto')dnl"
%endif
%if "%{with_milter}" == "yes"
- echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')dnl"
- echo "APPENDDEF(\`conf_libmilter_ENVDEF',
\`-D_FFR_MILTER_ROOT_UNSAFE')dnl"
+ echo "APPENDDEF(\`conf_sendmail_ENVDEF', \`-DMILTER')dnl"
+ echo "APPENDDEF(\`conf_libmilter_ENVDEF', \`-D_FFR_MILTER_ROOT_UNSAFE')dnl"
%endif
%if "%{with_ldap}" == "yes"
- echo "APPENDDEF(\`confMAPDEF', \`-DLDAPMAP')dnl"
- echo "APPENDDEF(\`confENVDEF', \`-DSM_CONF_LDAP_MEMFREE=1')dnl"
- echo "APPENDDEF(\`confLIBS', \`-lldap -llber -lssl -lcrypto')dnl"
+ echo "APPENDDEF(\`confMAPDEF', \`-DLDAPMAP')dnl"
+ echo "APPENDDEF(\`confENVDEF', \`-DSM_CONF_LDAP_MEMFREE=1')dnl"
+ echo "APPENDDEF(\`confLIBS', \`-lldap -llber -lssl -lcrypto')dnl"
%endif
%if "%{with_mysql}" == "yes"
- echo "APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl"
- echo "APPENDDEF(\`confINCDIRS',\`%{l_cppflags mysql .}')dnl"
- echo "APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz
-lm')dnl"
+ echo "APPENDDEF(\`confMAPDEF',\`-DMYSQLMAP')dnl"
+ echo "APPENDDEF(\`confINCDIRS',\`%{l_cppflags mysql .}')dnl"
+ echo "APPENDDEF(\`confLIBS',\`%{l_ldflags mysql .} -lmysqlclient -lz
-lm')dnl"
%endif
- ) >devtools/Site/site.config.m4
+ ) >devtools/Site/site.config.m4
- # build Sendmail package
- %{l_make} %{l_mflags}
+ # build Sendmail package
+ %{l_make} %{l_mflags}
%if "%{with_milter}" == "yes"
- # have to separately invoke "Build" script in libmilter dir
- ( cd libmilter
- ./Build
- ) || exit $?
-%endif
+ # have to separately invoke "Build" script in libmilter dir
+ ( cd libmilter
+ ./Build
) || exit $?
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -233,43 +219,41 @@
$RPM_BUILD_ROOT%{l_prefix}/man/cat8
# install Sendmail
- ( cd sendmail-%{version}
- %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT \
- INSTALL=`pwd`/devtools/bin/install.sh \
- MAILDIR=%{l_prefix}/etc/sendmail
- mv $RPM_BUILD_ROOT%{l_prefix}/bin/rmail \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
+ %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT \
+ INSTALL=`pwd`/devtools/bin/install.sh \
+ MAILDIR=%{l_prefix}/etc/sendmail
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/rmail \
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/rmail
%if "%{with_milter}" == "yes"
- # install libraries and includes for building milters
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/include/libmilter
- %{l_shtool} install -c -m 644 \
- include/libmilter/*.h \
- $RPM_BUILD_ROOT%{l_prefix}/include/libmilter/
- %{l_shtool} install -c -m 644 \
- obj.*/libsm/libsm.a \
- obj.*/libsmutil/libsmutil.a \
- obj.*/libsmdb/libsmdb.a \
- obj.*/libmilter/libmilter.a \
- $RPM_BUILD_ROOT%{l_prefix}/lib/
-%endif
-
- # remember the Sendmail M4 stuff for re-configuration
- ( %{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf ) || exit $?
- compress $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
- %{l_shtool} install -c -m 644 cf/README \
- $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.README
- %{l_shtool} install -c -m 755 \
- -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
- contrib/re-mqueue.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/re-mqueue
- %{l_shtool} install -c -m 755 \
- -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
- contrib/qtool.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/qtool
- %{l_shtool} install -c -m 755 \
- -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
- contrib/qtool.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qtool.8
- ) || exit $?
+ # install libraries and includes for building milters
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/include/libmilter
+ %{l_shtool} install -c -m 644 \
+ include/libmilter/*.h \
+ $RPM_BUILD_ROOT%{l_prefix}/include/libmilter/
+ %{l_shtool} install -c -m 644 \
+ obj.*/libsm/libsm.a \
+ obj.*/libsmutil/libsmutil.a \
+ obj.*/libsmdb/libsmdb.a \
+ obj.*/libmilter/libmilter.a \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/
+%endif
+
+ # remember the Sendmail M4 stuff for re-configuration
+ ( %{l_tar} cf $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar cf ) || exit $?
+ compress $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.tar
+ %{l_shtool} install -c -m 644 cf/README \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/sendmail/cf.README
+ %{l_shtool} install -c -m 755 \
+ -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
+ contrib/re-mqueue.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/re-mqueue
+ %{l_shtool} install -c -m 755 \
+ -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
+ contrib/qtool.pl $RPM_BUILD_ROOT%{l_prefix}/sbin/qtool
+ %{l_shtool} install -c -m 755 \
+ -e 's;^#!.*;#!%{l_prefix}/bin/perl;' \
+ contrib/qtool.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/qtool.8
# install a reasonable default configuration
( cd etc.sendmail
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
