svn812: vlmcsd-svn812-2015-08-30-Hotbird64

GNUmakefile

@@ -121,6 +121,10 @@ ifneq ($(NO_DNS),1)
       BASELDFLAGS += -lresolv
     endif
 
+    ifeq ($(OPENBSD),1)
+      DNS_PARSER := internal
+    endif
+
     ifeq ($(SOLARIS),1)
       BASELDFLAGS += -lresolv
     endif
@@ -551,6 +555,7 @@ help:
 	@echo "Other useful CFLAGS:"
 	@echo "    -DSUPPORT_WINE               Add code that the Windows version of $(PROGRAM_NAME) runs on Wine if MSRPC=1"
 	@echo "    -D_PEDANTIC                  Report rare error/warning conditions instead of silently ignoring them."
+	@echo "    -DINCLUDE_BETAS              Include SKU / activation IDs for obsolete beta/preview products."
 	@echo "    -DFD_SETSIZE=<x>             Allow <x> -L statements in $(PROGRAM_NAME) (default: 64 on Windows, 1024 on most Unixes)."
 	@echo "    -flto                        Use link time optimization. Not supported by old compilers (gcc < 4.7). Use whenever supported."
 	@echo "    -flto=jobserver              Utilize all CPUs during link time optimization. Requires ${MAKE} -j <cpus>"

config.h

@@ -97,7 +97,7 @@
 /*
  * Uncomment the following #define if you are compiling for a platform that does
  * not correctly handle the SA_NOCLDWAIT flag when ignoring SIGCHLD, i.e. forked
- * processes remain as "zombies" after dying. This option will add SIGCHLD handler that
+ * processes remain as "zombies" after dying. This option will add a SIGCHLD handler that
  * "waits" for a child that has terminated. This is only required for a few
  * unixoid OSses.
  */
@@ -339,6 +339,25 @@
 
 
 
+/*
+ * ------------------------------------------------------------------------------------------
+ * Extra features not compiled by default because they are rarely needed
+ * ------------------------------------------------------------------------------------------
+ */
+
+
+#ifndef INCLUDE_BETAS
+/*
+ * Uncomment the following #define if you want obsolete beta/preview SKUs
+ * to be included in the extended product list.
+ */
+
+//#define INCLUDE_BETAS
+#endif
+
+
+
+
 /*
  * ----------------------------------------------------------------------------------------
  * Removal of features. Allows you to remove features of vlmcsd you do not need or want.

dns_srv.c

@@ -159,7 +159,7 @@ static int getDnsRawAnswer(const char *restrict query, unsigned char** receive_b
 			char* querystring = (char*)alloca(strlen(query) + 12);
 			strcpy(querystring, "_vlmcs._tcp");
 			strcat(querystring, query);
-			bytes_received = res_query(querystring, ns_c_in, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
+			bytes_received = res_query(querystring, C_IN, ns_t_srv, *receive_buffer, RECEIVE_BUFFER_SIZE);
 #		endif
 	}
 	else

dns_srv.h

@@ -26,6 +26,76 @@ typedef struct
 	unsigned char name[1];
 } dns_srv_record_t, *dns_srv_record_ptr;
 
+#if __OpenBSD__
+typedef enum __ns_type {
+	ns_t_invalid = 0,	/*%< Cookie. */
+	ns_t_a = 1,		/*%< Host address. */
+	ns_t_ns = 2,		/*%< Authoritative server. */
+	ns_t_md = 3,		/*%< Mail destination. */
+	ns_t_mf = 4,		/*%< Mail forwarder. */
+	ns_t_cname = 5,		/*%< Canonical name. */
+	ns_t_soa = 6,		/*%< Start of authority zone. */
+	ns_t_mb = 7,		/*%< Mailbox domain name. */
+	ns_t_mg = 8,		/*%< Mail group member. */
+	ns_t_mr = 9,		/*%< Mail rename name. */
+	ns_t_null = 10,		/*%< Null resource record. */
+	ns_t_wks = 11,		/*%< Well known service. */
+	ns_t_ptr = 12,		/*%< Domain name pointer. */
+	ns_t_hinfo = 13,	/*%< Host information. */
+	ns_t_minfo = 14,	/*%< Mailbox information. */
+	ns_t_mx = 15,		/*%< Mail routing information. */
+	ns_t_txt = 16,		/*%< Text strings. */
+	ns_t_rp = 17,		/*%< Responsible person. */
+	ns_t_afsdb = 18,	/*%< AFS cell database. */
+	ns_t_x25 = 19,		/*%< X_25 calling address. */
+	ns_t_isdn = 20,		/*%< ISDN calling address. */
+	ns_t_rt = 21,		/*%< Router. */
+	ns_t_nsap = 22,		/*%< NSAP address. */
+	ns_t_nsap_ptr = 23,	/*%< Reverse NSAP lookup (deprecated). */
+	ns_t_sig = 24,		/*%< Security signature. */
+	ns_t_key = 25,		/*%< Security key. */
+	ns_t_px = 26,		/*%< X.400 mail mapping. */
+	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
+	ns_t_aaaa = 28,		/*%< Ip6 Address. */
+	ns_t_loc = 29,		/*%< Location Information. */
+	ns_t_nxt = 30,		/*%< Next domain (security). */
+	ns_t_eid = 31,		/*%< Endpoint identifier. */
+	ns_t_nimloc = 32,	/*%< Nimrod Locator. */
+	ns_t_srv = 33,		/*%< Server Selection. */
+	ns_t_atma = 34,		/*%< ATM Address */
+	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
+	ns_t_kx = 36,		/*%< Key Exchange */
+	ns_t_cert = 37,		/*%< Certification record */
+	ns_t_a6 = 38,		/*%< IPv6 address (deprecated, use ns_t_aaaa) */
+	ns_t_dname = 39,	/*%< Non-terminal DNAME (for IPv6) */
+	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
+	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
+	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
+	ns_t_tkey = 249,	/*%< Transaction key */
+	ns_t_tsig = 250,	/*%< Transaction signature. */
+	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
+	ns_t_axfr = 252,	/*%< Transfer zone of authority. */
+	ns_t_mailb = 253,	/*%< Transfer mailbox records. */
+	ns_t_maila = 254,	/*%< Transfer mail agent records. */
+	ns_t_any = 255,		/*%< Wildcard match. */
+	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
+	ns_t_max = 65536
+} ns_type;
+
+typedef enum __ns_class {
+	ns_c_invalid = 0,	/*%< Cookie. */
+	ns_c_in = 1,		/*%< Internet. */
+	ns_c_2 = 2,		/*%< unallocated/unsupported. */
+	ns_c_chaos = 3,		/*%< MIT Chaos-net. */
+	ns_c_hs = 4,		/*%< MIT Hesiod. */
+	/* Query class values which do not appear in resource records */
+	ns_c_none = 254,	/*%< for prereq. sections in update requests */
+	ns_c_any = 255,		/*%< Wildcard match. */
+	ns_c_max = 65536
+} ns_class;
+
+#endif
+
 int getKmsServerList(kms_server_dns_ptr** serverlist, const char *restrict query);
 void sortSrvRecords(kms_server_dns_ptr* serverlist, const int answers);
 

helpers.c

@@ -148,7 +148,7 @@ BOOL ucs2_to_utf8(const WCHAR* const ucs2_le, char* utf8, size_t maxucs2, size_t
 
 
 // Checks, whether a string is a valid integer number between min and max. Returns TRUE or FALSE. Puts int value in *value
-BOOL stringToInt(const char *const szValue, const int min, const int max, int *const value)
+BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value)
 {
 	char *nextchar;
 
@@ -160,7 +160,7 @@ BOOL stringToInt(const char *const szValue, const int min, const int max, int *c
 		return FALSE;
 	}
 
-	*value = (int)result;
+	*value = (unsigned int)result;
 	return TRUE;
 }
 
@@ -213,13 +213,13 @@ void LEGUID(GUID *const restrict out, const GUID* const restrict in)
 
 
 //Checks a command line argument if it is numeric and between min and max. Returns the numeric value or exits on error
-__pure int getOptionArgumentInt(const char o, const int min, const int max)
+__pure unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max)
 {
-	int result;
+	unsigned int result;
 
 	if (!stringToInt(optarg, min, max, &result))
 	{
-		printerrorf("Fatal: Option \"-%c\" must be numeric between %i and %i.\n", o, min, max);
+		printerrorf("Fatal: Option \"-%c\" must be numeric between %u and %u.\n", o, min, max);
 		exit(!0);
 	}
 

helpers.h

@@ -13,8 +13,8 @@
 #define GUID_BE 1
 #define GUID_SWAP 2
 
-BOOL stringToInt(const char *const szValue, const int min, const int max, int *const value);
-int getOptionArgumentInt(const char o, const int min, const int max);
+BOOL stringToInt(const char *const szValue, const unsigned int min, const unsigned int max, unsigned int *const value);
+unsigned int getOptionArgumentInt(const char o, const unsigned int min, const unsigned int max);
 void optReset(void);
 char* win_strerror(const int message);
 int ucs2_to_utf8_char (const WCHAR ucs2_le, char *utf8);

kms.c

@@ -23,24 +23,8 @@
 #define FRIENDLY_NAME_OFFICE2010 "Office 2010"
 #define FRIENDLY_NAME_OFFICE2013 "Office"
 
-/*#ifndef EPID_WINDOWS
-#define EPID_WINDOWS "06401-00206-271-392041-03-1033-9600.0000-3622014"
-#endif
-
-#ifndef EPID_OFFICE2010
-#define EPID_OFFICE2010 "06401-00096-199-496023-03-1033-9600.0000-3622014"
-#endif
-
-#ifndef EPID_OFFICE2013
-#define EPID_OFFICE2013 "06401-00206-234-409313-03-1033-9600.0000-3622014"
-#endif
-
-#ifndef HWID
-#define HWID 0x36, 0x4F, 0x46, 0x3A, 0x88, 0x63, 0xD3, 0x5F
-#endif*/
-
 #ifndef NO_BASIC_PRODUCT_LIST
-// Do not change the order of this list. Append items as necessary //58e2134f-8e11-4d17-9cb2-91069c151148
+// Do not change the order of this list. Append items as necessary
 const KmsIdList ProductList[] = {
 	/* 000 */ { { 0x212a64dc, 0x43b1, 0x4d3d, { 0xa3, 0x0c, 0x2f, 0xc6, 0x9d, 0x20, 0x95, 0xc6 } } /*"212a64dc-43b1-4d3d-a30c-2fc69d2095c6"*/, "Vista",                    EPID_WINDOWS,    4, 25 },
 	/* 001 */ { { 0x7fde5219, 0xfbfa, 0x484a, { 0x82, 0xc9, 0x34, 0xd1, 0xad, 0x53, 0xe8, 0x56 } } /*"7fde5219-fbfa-484a-82c9-34d1ad53e856"*/, "Windows 7",                EPID_WINDOWS,    4, 25 },

make_dragonfly

@@ -0,0 +1,31 @@
+#!/usr/local/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+
+gmake $MAKEFLAGS PROGRAM_NAME=vlmcsd-DragonFly-x64 CLIENT_NAME=vlmcs-DragonFly-x64 CFLAGS="$CF" LDFLAGS="$LF"
+rm vlmcsd.o vlmcs.o
+gmake vlmcsdmulti-DragonFly-x64 $REUSEOBJFLAGS CFLAGS="$CF" LDFLAGS="$LF" MULTI_NAME=vlmcsdmulti-DragonFly-x64
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-DragonFly-x64 /usr/local/sbin/vlmcsd
+cp -af vlmcs-DragonFly-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64:x/binaries/DragonFly/intel/

make_freebsd

@@ -14,33 +14,33 @@ CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tabl
 LF="-Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none"
 LFCLANG="-Wl,-z,norelro -Wl,--hash-style=gnu"
 
-gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.1-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-gcc CC=gcc5 CFLAGS="$CF" LDFLAGS="$LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x64-gcc CLIENT_NAME=vlmcs-FreeBSD-10.2-x64-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-gcc CC=gcc5 CFLAGS="$CF" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.1-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.2-x64 PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.*
-gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.1-x64 MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.2-x64 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x64 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.1-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS CLIENT_NAME=vlmcs-FreeBSD-10.2-x86 PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 rm -f vlmcs.o vlmcsd.o vlmcsdmulti.o *_all.*
-gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.1-x86 MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $REUSEOBJFLAGS vlmcsdmulti-FreeBSD-10.2-x86 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x86 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 
-gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.1-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.1-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-gcc CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS allmulti CAT=2 MULTI_NAME=vlmcsdmulti-FreeBSD-10.2-x86-gcc CLIENT_NAME=vlmcs-FreeBSD-10.2-x86-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-gcc CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-L/usr/lib32 -B/usr/lib32 $LF"
 
-gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.1-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS vlmcsd-FreeBSD-10.1-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS vlmcsd-FreeBSD-10.1-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
-gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.1-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.2-x64-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.2-x64-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS vlmcsd-FreeBSD-10.2-x86-threads PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-threads THREADS=1 CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="-lpthread $LF"
+gmake $MAKEFLAGS CAT=2 vlmcsd-FreeBSD-10.2-x86-threads-gcc PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-threads-gcc THREADS=1 CC=gcc5 CFLAGS="$CF -m32 -DCOMPAT_32BIT" LDFLAGS="-lpthread -L/usr/lib32 -B/usr/lib32 $LF"
 
-gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.1-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x64-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
-gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.1-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.1-x86-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.2-x64-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x64-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG" LDFLAGS="$LF"
+gmake $MAKEFLAGS CRYPTO=openssl_with_aes CLIENT_NAME=vlmcs-FreeBSD-10.2-x86-openssl1.0.1-EXPERIMENTAL PROGRAM_NAME=vlmcsd-FreeBSD-10.2-x86-openssl1.0.1-EXPERIMENTAL CC=clang36 CFLAGS="$CFCLANG -m32" LDFLAGS="$LF"
 
 rm *.o
 
 strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
 sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
 
-sudo cp -af vlmcsd-FreeBSD-10.1-x86-gcc /usr/local/sbin/vlmcsd
-sudo cp -af vlmcs-FreeBSD-10.1-x86-gcc /usr/local/bin/vlmcs
+sudo cp -af vlmcsd-FreeBSD-10.2-x86-gcc /usr/local/sbin/vlmcsd
+sudo cp -af vlmcs-FreeBSD-10.2-x86-gcc /usr/local/bin/vlmcs
 
 # Copy everything to distribution server
 scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64:x/binaries/FreeBSD/intel/

make_linux

@@ -55,6 +55,9 @@ mkdir -p binaries/MacOSX/ppc
 mkdir -p binaries/iOS/arm
 
 mkdir -p binaries/FreeBSD/intel
+mkdir -p binaries/NetBSD/intel
+mkdir -p binaries/OpenBSD/intel
+mkdir -p binaries/DragonFly/intel
 mkdir -p binaries/Solaris/intel
 mkdir -p binaries/Windows/intel
 mkdir -p binaries/Minix/intel

make_netbsd

@@ -0,0 +1,35 @@
+#!/usr/pkg/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-flto=12 -static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro -Wl,--hash-style=sysv -Wl,--build-id=none"
+LFCLANG="-Wl,-z,norelro -Wl,--hash-style=sysv"
+
+gmake $MAKEFLAGS CC=/usr/pkg/gcc49/bin/gcc PROGRAM_NAME=vlmcsd-NetBSD-x64 CLIENT_NAME=vlmcs-NetBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
+rm vlmcsd.o vlmcs.o
+gmake vlmcsdmulti-NetBSD-x64 $REUSEOBJFLAGS CC=/usr/pkg/gcc49/bin/gcc CFLAGS="$CF" LDFLAGS="$LF" MULTI_NAME=vlmcsdmulti-NetBSD-x64
+
+gmake allmulti $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-NetBSD-x86 PROGRAM_NAME=vlmcsd-NetBSD-x86 CLIENT_NAME=vlmcs-NetBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-NetBSD-x64-clang CLIENT_NAME=vlmcs-NetBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -af vlmcsd-NetBSD-x86 /usr/local/sbin/vlmcsd
+cp -af vlmcs-NetBSD-x86 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64:x/binaries/NetBSD/intel/

make_openbsd

@@ -0,0 +1,33 @@
+#!/usr/local/bin/bash
+
+export VERBOSE=3
+export DNS_PARSER=OS
+
+rm -f vlmcsd-* vlmcs-* vlmcsdmulti-* *_all.* 2>/dev/null
+rm -f vlmcsdmulti vlmcsd vlmcs 2>/dev/null
+
+MAKEFLAGS="-B -j12"
+REUSEOBJFLAGS="-j12"
+
+CF="-static-libgcc -pipe -fwhole-program -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CF45="-static-libgcc -pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+CFCLANG="-pipe -fno-common -fno-exceptions -fno-stack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fmerge-all-constants"
+LF="-Wl,-z,norelro"
+LFCLANG="-Wl,-z,norelro"
+
+gmake allmulti CAT=2 $MAKEFLAGS CC=egcc MULTI_NAME=vlmcsdmulti-OpenBSD-x64 PROGRAM_NAME=vlmcsd-OpenBSD-x64 CLIENT_NAME=vlmcs-OpenBSD-x64 CFLAGS="$CF" LDFLAGS="$LF"
+
+#gmake allmulti $MAKEFLAGS CAT=2 MULTI_NAME=vlmcsdmulti-OpenBSD-x86 PROGRAM_NAME=vlmcsd-OpenBSD-x86 CLIENT_NAME=vlmcs-OpenBSD-x86 CFLAGS="$CF45 -m32" LDFLAGS="$LF"
+
+#gmake $MAKEFLAGS CC=clang PROGRAM_NAME=vlmcsd-OpenBSD-x64-clang CLIENT_NAME=vlmcs-OpenBSD-x64-clang CFLAGS="$CFCLANG" LDFLAGS="$LFCLANG"
+
+rm *.o
+
+strip -s --strip-unneeded --remove-section=.eh_frame_hdr --remove-section=.eh_frame --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag vlmcs-* vlmcsd-* vlmcsdmulti-*
+#sstrip -z vlmcs-* vlmcsd-* vlmcsdmulti-*
+
+cp -f vlmcsd-OpenBSD-x64 /usr/local/sbin/vlmcsd
+cp -f vlmcs-OpenBSD-x64 /usr/local/bin/vlmcs
+
+# Copy everything to distribution server
+scp -p vlmcsdmulti-* vlmcsd-* vlmcs-* root@ubuntu64:x/binaries/OpenBSD/intel/

shared_globals.c

@@ -36,9 +36,9 @@ DWORD ServerTimeout = 30;
 
 #if !defined(NO_LIMIT) && !defined (NO_SOCKETS) && !__minix__
 #ifdef USE_MSRPC
-int32_t MaxTasks = RPC_C_LISTEN_MAX_CALLS_DEFAULT;
+uint32_t MaxTasks = RPC_C_LISTEN_MAX_CALLS_DEFAULT;
 #else // !USE_MSRPC
-int32_t MaxTasks = SEM_VALUE_MAX;
+uint32_t MaxTasks = SEM_VALUE_MAX;
 #endif // !USE_MSRPC
 #endif // !defined(NO_LIMIT) && !defined (NO_SOCKETS) && !__minix__
 

shared_globals.h

@@ -105,7 +105,7 @@ extern DWORD ServerTimeout;
 #endif // !defined(NO_TIMEOUT) && !__minix__
 
 #if !defined(NO_LIMIT) && !defined (NO_SOCKETS) && !__minix__
-extern int32_t MaxTasks;
+extern uint32_t MaxTasks;
 #endif // !defined(NO_LIMIT) && !defined (NO_SOCKETS) && !__minix__
 
 #ifndef NO_LOG