Attachment #185443 for bug #262919




# libdkim makefile for UNIX
#

DESTDIR ?= /

CFLAGS  += -fPIC
LIBS    = -lcrypto -lresolv
#else
CFLAGS  = -c
LFLAGS  = 
LIBS    = -lcrypto 
#endif

INCL	=  -I /usr/include/openssl/



HDRS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h

all: libdkim.so.1 libdkimtest

libdkim.a: $(OBJS)
	rm -f libdkim.a
	ar cr libdkim.a $(OBJS)
	ranlib libdkim.a

libdkim.so.1: $(OBJS)
	$(CXX) -shared -Wl,-soname,$@.1 $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
	ln -s $@ libdkim.so

.cpp.o:
	$(CXX) $(CFLAGS) -c $<

libdkimtest : libdkim.so.1 libdkimtest.o
	$(CXX) -o$@ $(LDFLAGS) \
	       -L. libdkimtest.o $(LIBS) -ldkim
	
libdkimtest.o: libdkimtest.cpp $(HDRS)

.cpp.o:
	g++ $(CFLAGS) -c $<

clean:
	rm -f *.o libdkim.{a,so,so.1} libdkimtest

install: all
	install -D -m 0755 libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so.1
	ln -s libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so
	install -D -m 0644 dkim.h $(DESTDIR)/usr/include/dkim.h
	install -D -m 0755 libdkimtest $(DESTDIR)/usr/bin/libdkimtest






#define DKIM_CALL	WINAPI
#else
#define DKIM_CALL
#define MAKELONG(a,b) ((long)(((unsigned)(a) & 0xffff) | (((unsigned)(b) & 0xffff) << 16)))
#endif




char *DKIM_CALL DKIMGetErrorString( int ErrorCode );

#ifndef _WIN32
/*
 * macros.h:  Useful macros
 *
 * Author:
 *	Dick Porter (dick@ximian.com)
 *
 * (C) 2002 Ximian, Inc.
 */
#ifndef _WAPI_MACROS_H_
#define _WAPI_MACROS_H_

#include <sys/types.h>

#define MAKEWORD(low, high) ((__uint16_t)(((__uint8_t)(low)) | \
				       ((__uint16_t)((__uint8_t)(high))) << 8))
#define MAKELONG(low, high) ((__uint32_t)(((__uint16_t)(low)) | \
				       ((__uint32_t)((__uint16_t)(high))) << 16))
#define LOWORD(i32) ((__uint16_t)((i32) & 0xFFFF))
#define HIWORD(i32) ((__uint16_t)(((__uint32_t)(i32) >> 16) & 0xFFFF))
#define LOBYTE(i16) ((__uint8_t)((i16) & 0xFF))
#define HIBYTE(i16) ((__uint8_t)(((__uint16_t)(i16) >> 8) & 0xFF))

#endif /* _WAPI_MACROS_H_ */
#endif

#ifdef __cplusplus
}
#endif

Lines 25-32 Link Here

(-)libdkim.orig/src/dkimsign.cpp (-2 lines)
25	#else	25	#else
26	#define _strnicmp strncasecmp	26	#define _strnicmp strncasecmp
27	#define _stricmp strcasecmp	27	#define _stricmp strcasecmp
28	#define LOWORD(l) ((unsigned)(l) & 0xffff)
29	#define HIWORD(l) ((unsigned)(l) >> 16)
30	#endif	28	#endif
31		29
32	#include <string.h>	30	#include <string.h>

Return to bug 262919

Lines 22-28 Link Here

(-)libdkim.orig/src/dkim.h (-1 / +26 lines)
22	#define DKIM_CALL WINAPI	22	#define DKIM_CALL WINAPI
23	#else	23	#else
24	#define DKIM_CALL	24	#define DKIM_CALL
25	#define MAKELONG(a,b) ((long)(((unsigned)(a) & 0xffff) \| (((unsigned)(b) & 0xffff) << 16)))
26	#endif	25	#endif
27		26
28		27
Lines 162-167 Link Here
162		161
163	char *DKIM_CALL DKIMGetErrorString( int ErrorCode );	162	char *DKIM_CALL DKIMGetErrorString( int ErrorCode );
164		163
		164	#ifndef _WIN32
		165	/*
		166	* macros.h: Useful macros
		167	*
		168	* Author:
		169	* Dick Porter (dick@ximian.com)
		170	*
		171	* (C) 2002 Ximian, Inc.
		172	*/
		173	#ifndef _WAPI_MACROS_H_
		174	#define _WAPI_MACROS_H_
		175
		176	#include <sys/types.h>
		177
		178	#define MAKEWORD(low, high) ((__uint16_t)(((__uint8_t)(low)) \| \
		179	((__uint16_t)((__uint8_t)(high))) << 8))
		180	#define MAKELONG(low, high) ((__uint32_t)(((__uint16_t)(low)) \| \
		181	((__uint32_t)((__uint16_t)(high))) << 16))
		182	#define LOWORD(i32) ((__uint16_t)((i32) & 0xFFFF))
		183	#define HIWORD(i32) ((__uint16_t)(((__uint32_t)(i32) >> 16) & 0xFFFF))
		184	#define LOBYTE(i16) ((__uint8_t)((i16) & 0xFF))
		185	#define HIBYTE(i16) ((__uint8_t)(((__uint16_t)(i16) >> 8) & 0xFF))
		186
		187	#endif /* _WAPI_MACROS_H_ */
		188	#endif
		189
165	#ifdef __cplusplus	190	#ifdef __cplusplus
166	}	191	}
167	#endif	192	#endif

Lines 1-15 Link Here

(-)libdkim.orig/src/Makefile (-15 / +21 lines)
1	# libdkim makefile for UNIX	1	# libdkim makefile for UNIX
2	#	2	#
3		3
4	#ifdef LINUX	4	DESTDIR ?= /
5	CFLAGS = -c	5
6	LFLAGS =	6	CFLAGS += -fPIC
7	LIBS = -lcrypto -lresolv	7	LIBS = -lcrypto -lresolv
8	#else
9	CFLAGS = -c
10	LFLAGS =
11	LIBS = -lcrypto
12	#endif
13		8
14	INCL = -I /usr/include/openssl/	9	INCL = -I /usr/include/openssl/
15		10
Lines 19-41 Link Here
19		14
20	HDRS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h	15	HDRS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h
21		16
22	all: libdkim.a libdkimtest	17	all: libdkim.so.1 libdkimtest
23		18
24	libdkim.a: $(OBJS)	19	libdkim.a: $(OBJS)
25	rm -f libdkim.a	20	rm -f libdkim.a
26	ar cr libdkim.a $(OBJS)	21	ar cr libdkim.a $(OBJS)
27	ranlib libdkim.a	22	ranlib libdkim.a
28		23
29	libdkimtest : libdkim.a libdkimtest.o	24	libdkim.so.1: $(OBJS)
30	g++ -olibdkimtest $(LFLAGS) \	25	$(CXX) -shared -Wl,-soname,$@.1 $(LDFLAGS) $(OBJS) -o $@ $(LIBS)
31	-L . libdkimtest.o $(LIBS) -ldkim	26	ln -s $@ libdkim.so
		27
		28	.cpp.o:
		29	$(CXX) $(CFLAGS) -c $<
		30
		31	libdkimtest : libdkim.so.1 libdkimtest.o
		32	$(CXX) -o$@ $(LDFLAGS) \
		33	-L. libdkimtest.o $(LIBS) -ldkim
32		34
33	libdkimtest.o: libdkimtest.cpp $(HDRS)	35	libdkimtest.o: libdkimtest.cpp $(HDRS)
34		36
35	.cpp.o:
36	g++ $(CFLAGS) -c $<
37		37
38	clean:	38	clean:
39	rm *.o libdkim.lib libdkimtest	39	rm -f *.o libdkim.{a,so,so.1} libdkimtest
		40
		41	install: all
		42	install -D -m 0755 libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so.1
		43	ln -s libdkim.so.1 $(DESTDIR)/usr/lib/libdkim.so
		44	install -D -m 0644 dkim.h $(DESTDIR)/usr/include/dkim.h
		45	install -D -m 0755 libdkimtest $(DESTDIR)/usr/bin/libdkimtest
40		46
41		47