API tools faq
paste
venture37

update mail/opensmtpd (WiP)

venture37
Feb 3rd, 2016
158
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.45 KB | None | 0 0
raw download clone embed print report
  1. Index: mail/opensmtpd/Makefile
  2. ===================================================================
  3. RCS file: /cvsroot/pkgsrc/mail/opensmtpd/Makefile,v
  4. retrieving revision 1.6
  5. diff -u -p -r1.6 Makefile
  6. --- mail/opensmtpd/Makefile 12 Dec 2015 01:24:13 -0000 1.6
  7. +++ mail/opensmtpd/Makefile 3 Feb 2016 16:45:00 -0000
  8. @@ -1,8 +1,8 @@
  9. # $NetBSD: Makefile,v 1.6 2015/12/12 01:24:13 wiedi Exp $
  10.  
  11. -VERSION= 5.3.3p1
  12. +VERSION= 5.7.3p2
  13. DISTNAME= opensmtpd-${VERSION}
  14. -PKGREVISION= 1
  15. +#PKGREVISION= 1
  16. CATEGORIES= mail net
  17. MASTER_SITES= http://www.opensmtpd.org/archives/
  18.  
  19. Index: mail/opensmtpd/distinfo
  20. ===================================================================
  21. RCS file: /cvsroot/pkgsrc/mail/opensmtpd/distinfo,v
  22. retrieving revision 1.3
  23. diff -u -p -r1.3 distinfo
  24. --- mail/opensmtpd/distinfo 3 Nov 2015 23:27:11 -0000 1.3
  25. +++ mail/opensmtpd/distinfo 3 Feb 2016 16:45:00 -0000
  26. @@ -1,9 +1,10 @@
  27. $NetBSD: distinfo,v 1.3 2015/11/03 23:27:11 agc Exp $
  28.  
  29. -SHA1 (opensmtpd-5.3.3p1.tar.gz) = a7fc3a15b5dc622410fcedf51bbe62e6b6d64df3
  30. -RMD160 (opensmtpd-5.3.3p1.tar.gz) = 97f63e37fa6ce1f5f58d816088c5b356f99167c3
  31. -SHA512 (opensmtpd-5.3.3p1.tar.gz) = 8ea72773dca4f907d2b8285fc7abcd5c4c19ceb50b547cc4a217ec296a222f8134bfc4bc7707439b0c5d58b5354f92ebed65966179d7598c4793cad4370b087b
  32. -Size (opensmtpd-5.3.3p1.tar.gz) = 343733 bytes
  33. -SHA1 (patch-configure.ac) = ed819952951700c057c11200095a72972aafc1f9
  34. +SHA1 (opensmtpd-5.7.3p2.tar.gz) = 4d1edc5811a80ec26de040227a298a742c494e72
  35. +RMD160 (opensmtpd-5.7.3p2.tar.gz) = 5d6faebea3a303e5effeafbef5def597bfac434e
  36. +SHA512 (opensmtpd-5.7.3p2.tar.gz) = bac0b8d6a6969a5e49a1d45b2c74cb2f3da44d06b12c7162500adf3ca312751020762bc8301075a9d7634d94cf51f978d04fac327f843680646e9e687737c42f
  37. +Size (opensmtpd-5.7.3p2.tar.gz) = 709074 bytes
  38. +SHA1 (patch-configure.ac) = 7ae25ffb591709a639b5deaab340600e23aebe30
  39. +SHA1 (patch-mk_smtpd_Makefile.am) = 24b9f98c83b69db48f38309495fddf3d52471851
  40. SHA1 (patch-smtpd_Makefile.am) = 4267002ecadceaf68868b9d782d5e6f8571ebc36
  41. -SHA1 (patch-smtpd_queue_fsqueue.c) = 80dae37705378c022c1a76d31ea54a3f907b6c1a
  42. +SHA1 (patch-smtpd_queue_fs.c) = 4cf53412daa25f53511d9b8c9d196fbe366ab31d
  43. Index: mail/opensmtpd/patches/patch-configure.ac
  44. ===================================================================
  45. RCS file: /cvsroot/pkgsrc/mail/opensmtpd/patches/patch-configure.ac,v
  46. retrieving revision 1.1
  47. diff -u -p -r1.1 patch-configure.ac
  48. --- mail/opensmtpd/patches/patch-configure.ac 18 Nov 2013 22:50:01 -0000 1.1
  49. +++ mail/opensmtpd/patches/patch-configure.ac 3 Feb 2016 16:45:00 -0000
  50. @@ -1,14 +1,14 @@
  51. -$NetBSD: patch-configure.ac,v 1.1 2013/11/18 22:50:01 pettai Exp $
  52. +$NetBSD$
  53.  
  54. Add sys/statvfs for NetBSD
  55.  
  56. ---- configure.ac.orig 2013-05-16 15:19:59.000000000 +0000
  57. +--- configure.ac.orig 2016-02-02 07:40:06.000000000 +0000
  58. +++ configure.ac
  59. -@@ -261,6 +261,7 @@ AC_CHECK_HEADERS([ \
  60. +@@ -338,6 +338,7 @@ AC_CHECK_HEADERS([ \
  61. sys/ndir.h \
  62. sys/pstat.h \
  63. sys/statfs.h \
  64. + sys/statvfs.h \
  65. + sys/time.h \
  66. sys/un.h \
  67. - ucred.h \
  68. - util.h \
  69. + time.h \
  70. Index: mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am
  71. ===================================================================
  72. RCS file: mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am
  73. diff -N mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am
  74. --- /dev/null 1 Jan 1970 00:00:00 -0000
  75. +++ mail/opensmtpd/patches/patch-mk_smtpd_Makefile.am 3 Feb 2016 16:45:00 -0000
  76. @@ -0,0 +1,29 @@
  77. +$NetBSD$
  78. +
  79. +Install the configuration file in the example directory instead.
  80. +
  81. +--- mk/smtpd/Makefile.am.orig 2016-02-03 13:29:37.000000000 +0000
  82. ++++ mk/smtpd/Makefile.am
  83. +@@ -151,17 +151,16 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
  84. +
  85. + # smtpd.conf
  86. + # newaliases makemap
  87. ++
  88. ++EXAMPLE_DIR=@EXAMPLE_DIR@
  89. ++
  90. + install-exec-hook: $(CONFIGFILES) $(MANPAGES)
  91. +- $(MKDIR_P) $(DESTDIR)$(sysconfdir)
  92. ++ $(MKDIR_P) $(DESTDIR)$(EXAMPLE_DIR)
  93. + $(MKDIR_P) $(DESTDIR)$(bindir)
  94. + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
  95. + $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
  96. +
  97. +- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
  98. +- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
  99. +- else \
  100. +- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
  101. +- fi
  102. ++ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(EXAMPLE_DIR)/smtpd.conf
  103. +
  104. + $(INSTALL) -m 644 aliases.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/aliases.5
  105. + $(INSTALL) -m 644 forward.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/forward.5
  106. Index: mail/opensmtpd/patches/patch-smtpd_Makefile.am
  107. ===================================================================
  108. RCS file: mail/opensmtpd/patches/patch-smtpd_Makefile.am
  109. diff -N mail/opensmtpd/patches/patch-smtpd_Makefile.am
  110. --- mail/opensmtpd/patches/patch-smtpd_Makefile.am 18 Nov 2013 22:50:01 -0000 1.1
  111. +++ /dev/null 1 Jan 1970 00:00:00 -0000
  112. @@ -1,29 +0,0 @@
  113. -$NetBSD: patch-smtpd_Makefile.am,v 1.1 2013/11/18 22:50:01 pettai Exp $
  114. -
  115. -Install the configuration file in the example directory
  116. -
  117. ---- smtpd/Makefile.am.orig 2013-03-08 18:22:39.000000000 +0000
  118. -+++ smtpd/Makefile.am
  119. -@@ -154,17 +154,16 @@ $(CONFIGFILES): $(CONFIGFILES_IN)
  120. -
  121. - # smtpd.conf
  122. - # newaliases makemap
  123. -+
  124. -+EXAMPLE_DIR=@EXAMPLE_DIR@
  125. -+
  126. - install-exec-hook: $(CONFIGFILES) $(MANPAGES)
  127. -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)
  128. -+ $(MKDIR_P) $(DESTDIR)$(EXAMPLE_DIR)
  129. - $(MKDIR_P) $(DESTDIR)$(bindir)
  130. - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
  131. - $(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
  132. -
  133. -- @if [ ! -f $(DESTDIR)$(sysconfdir)/smtpd.conf ]; then \
  134. -- $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(sysconfdir)/smtpd.conf; \
  135. -- else \
  136. -- echo "$(DESTDIR)$(sysconfdir)/smtpd.conf already exists, install will not overwrite"; \
  137. -- fi
  138. -+ $(INSTALL) -m 644 smtpd.conf.out $(DESTDIR)$(EXAMPLE_DIR)/smtpd.conf
  139. -
  140. - ln -f $(DESTDIR)$(sbindir)/smtpctl$(EXEEXT) \
  141. - $(DESTDIR)$(bindir)/mailq$(EXEEXT);
  142. Index: mail/opensmtpd/patches/patch-smtpd_queue_fs.c
  143. ===================================================================
  144. RCS file: mail/opensmtpd/patches/patch-smtpd_queue_fs.c
  145. diff -N mail/opensmtpd/patches/patch-smtpd_queue_fs.c
  146. --- /dev/null 1 Jan 1970 00:00:00 -0000
  147. +++ mail/opensmtpd/patches/patch-smtpd_queue_fs.c 3 Feb 2016 16:45:00 -0000
  148. @@ -0,0 +1,19 @@
  149. +$NetBSD$
  150. +
  151. +NetBSD uses statvfs, not statfs.
  152. +
  153. +--- smtpd/queue_fs.c.orig 2016-02-03 13:18:36.000000000 +0000
  154. ++++ smtpd/queue_fs.c
  155. +@@ -30,6 +30,12 @@
  156. + #ifdef HAVE_SYS_STATFS_H
  157. + #include <sys/statfs.h>
  158. + #endif
  159. ++#ifdef HAVE_SYS_STATVFS_H
  160. ++#include <sys/statvfs.h>
  161. ++#ifdef __NetBSD__
  162. ++define statfs statvfs
  163. ++#endif
  164. ++#endif
  165. +
  166. + #include <ctype.h>
  167. + #include <dirent.h>
  168. Index: mail/opensmtpd/patches/patch-smtpd_queue_fsqueue.c
  169. ===================================================================
  170. RCS file: mail/opensmtpd/patches/patch-smtpd_queue_fsqueue.c
  171. diff -N mail/opensmtpd/patches/patch-smtpd_queue_fsqueue.c
  172. --- mail/opensmtpd/patches/patch-smtpd_queue_fsqueue.c 18 Nov 2013 22:50:01 -0000 1.1
  173. +++ /dev/null 1 Jan 1970 00:00:00 -0000
  174. @@ -1,18 +0,0 @@
  175. -$NetBSD: patch-smtpd_queue_fsqueue.c,v 1.1 2013/11/18 22:50:01 pettai Exp $
  176. -
  177. -NetBSD use statvfs, not statfs.
  178. -
  179. ---- smtpd/queue_fsqueue.c.orig 2013-05-16 15:19:59.000000000 +0000
  180. -+++ smtpd/queue_fsqueue.c
  181. -@@ -26,5 +26,11 @@
  182. - #ifdef HAVE_SYS_STATFS_H
  183. - #include <sys/statfs.h>
  184. - #endif
  185. -+#ifdef HAVE_SYS_STATVFS_H
  186. -+#include <sys/statvfs.h>
  187. -+#ifdef __NetBSD__
  188. -+#define statfs statvfs
  189. -+#endif
  190. -+#endif
  191. - #include <sys/param.h>
  192. - #include <sys/mount.h>
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!