CVS commit: pkgsrc/mail/oe2mbx

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Sep 23 12:22:39 UTC 2022

Modified Files:
        pkgsrc/mail/oe2mbx: distinfo
        pkgsrc/mail/oe2mbx/patches: patch-aa

Log Message:
oe2mbx: Properly separate linking and compilation stages to fix RELRO
builds.  TODO: libtoolize (but I kept running into some ".ila does not
exist" error)


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/mail/oe2mbx/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/oe2mbx/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/oe2mbx/distinfo
diff -u pkgsrc/mail/oe2mbx/distinfo:1.8 pkgsrc/mail/oe2mbx/distinfo:1.9
--- pkgsrc/mail/oe2mbx/distinfo:1.8     Tue Oct 26 10:54:11 2021
+++ pkgsrc/mail/oe2mbx/distinfo Fri Sep 23 12:22:38 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:54:11 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/09/23 12:22:38 nia Exp $
 
 BLAKE2s (oe2mbx-1.21.tar.gz) = 755be27acd061e352d4fa2ff9094e20a3ea6f0431c0264fd6f4556a9cf86196b
 SHA512 (oe2mbx-1.21.tar.gz) = 4149a45c475ebe62814295bfc8854bd319413db7b4c43bbc708189ce0122655b7bd4f5544d8fc5f522d5bcd7c098c545a76f7992fc2c38f6e8ccd15ddf2b936a
 Size (oe2mbx-1.21.tar.gz) = 22817 bytes
-SHA1 (patch-aa) = b43592c823057f57ac091449c8365995c3027440
+SHA1 (patch-aa) = 307103a93fe8163608892912fb2d3eed499e7106
 SHA1 (patch-src_liboe_c) = 2a2c90d94403b96e069ee1f2c0d8ff787d6dffb1

Index: pkgsrc/mail/oe2mbx/patches/patch-aa
diff -u pkgsrc/mail/oe2mbx/patches/patch-aa:1.2 pkgsrc/mail/oe2mbx/patches/patch-aa:1.3
--- pkgsrc/mail/oe2mbx/patches/patch-aa:1.2     Mon Feb 16 18:25:20 2009
+++ pkgsrc/mail/oe2mbx/patches/patch-aa Fri Sep 23 12:22:39 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2009/02/16 18:25:20 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2022/09/23 12:22:39 nia Exp $
 
---- makefile.orig      Sat Jun 17 17:30:36 2000
+--- makefile.orig      2000-06-17 15:30:36.000000000 +0000
 +++ makefile
-@@ -1,22 +1,22 @@
+@@ -1,22 +1,26 @@
  # MAKEFILE FOR LIBOE AND OE2MBX
  # Read README for info
  
@@ -12,15 +12,22 @@ $NetBSD: patch-aa,v 1.2 2009/02/16 18:25
  BINDIR = $(PREFIX)/bin
  INCLUDEDIR = $(PREFIX)/include
  
- oe2mbx : src/oe2mbx.c lib/liboe.o
+-oe2mbx : src/oe2mbx.c lib/liboe.o
 -      gcc src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
-+      $(CC) $(CFLAGS) src/oe2mbx.c lib/liboe.o -o bin/oe2mbx
- dynamic : src/oe2mbx.c
+-dynamic : src/oe2mbx.c
 -      gcc src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
-+      $(CC) $(CFLAGS) src/oe2mbx.c -DDYNAMIC -o bin/oe2mbx -loe
- liboe : src/liboe.c
+-liboe : src/liboe.c
 -      gcc -c src/liboe.c -o lib/liboe.so
-+      $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.so
++oe2mbx : src/oe2mbx.o lib/liboe.o
++      $(CC) $(LDFLAGS) src/oe2mbx.o lib/liboe.o -o bin/oe2mbx
++dynamic : src/oe2mbx.o
++      $(CC) $(LDFLAGS) src/oe2mbx.o -DDYNAMIC -o bin/oe2mbx -loe
++liboe : src/liboe.o
++      $(CC) $(LDFLAGS) -shared src/liboe.o -o lib/liboe.so
++
++src/oe2mbx.o : src/oe2mbx.c
++      $(CC) $(CFLAGS) -c src/oe2mbx.c -o src/oe2mbx.o
++
  lib/liboe.o : src/liboe.c
 -      gcc -c src/liboe.c -o lib/liboe.o       
 +      $(CC) $(CFLAGS) -c src/liboe.c -o lib/liboe.o