Skip to content

Commit

Permalink
cracklib: add patch for 2.10.1 to build on Darwin (#928)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alebcay
alebcay authored Jul 30, 2024
1 parent 1ed9eae commit 3bd3ae1
Showing 1 changed file with 205 additions and 0 deletions.
205 changes: 205 additions & 0 deletions cracklib/2.10.1-endian.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,205 @@
diff --new-file -ur a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,6 +7,7 @@ libcrack_la_SOURCES = fascist.c \
rules.c \
stringlib.c \
packer.h \
+ portable_endian.h \
crack.h

#
diff --new-file -ur a/lib/packlib.c b/lib/packlib.c
--- a/lib/packlib.c
+++ b/lib/packlib.c
@@ -16,12 +16,7 @@
#ifdef HAVE_STDINT_H
#include <stdint.h>
#endif
-#ifdef HAVE_ENDIAN_H
-#define _BSD_SOURCE
-#undef _DEFAULT_SOURCE
-#define _DEFAULT_SOURCE
-#include <endian.h>
-#endif
+#include "portable_endian.h"
#include "packer.h"

#define DEBUG 0
diff --new-file -ur a/lib/portable_endian.h b/lib/portable_endian.h
--- a/lib/portable_endian.h
+++ b/lib/portable_endian.h
@@ -0,0 +1,173 @@
+// Retrieved on 2024-07-26 from https://gist.github.com/panzi/6856583
+// https://gist.githubusercontent.com/panzi/6856583/raw/12f9f02f1298bb0bc054ba667bccc0cf032cdb03/portable_endian.h
+
+// "License": Public Domain
+// I, Mathias Panzenböck, place this file hereby into the public domain. Use it at your own risk for whatever you like.
+// In case there are jurisdictions that don't support putting things in the public domain you can also consider it to
+// be "dual licensed" under the BSD, MIT and Apache licenses, if you want to. This code is trivial anyway. Consider it
+// an example on how to get the endian conversion functions on different platforms.
+
+#ifndef PORTABLE_ENDIAN_H__
+#define PORTABLE_ENDIAN_H__
+
+#if (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) && !defined(__WINDOWS__)
+
+# define __WINDOWS__
+
+#endif
+
+#if defined(__linux__) || defined(__CYGWIN__)
+
+# include <endian.h>
+
+#elif defined(__APPLE__)
+
+# include <libkern/OSByteOrder.h>
+
+# define htobe16(x) OSSwapHostToBigInt16(x)
+# define htole16(x) OSSwapHostToLittleInt16(x)
+# define be16toh(x) OSSwapBigToHostInt16(x)
+# define le16toh(x) OSSwapLittleToHostInt16(x)
+
+# define htobe32(x) OSSwapHostToBigInt32(x)
+# define htole32(x) OSSwapHostToLittleInt32(x)
+# define be32toh(x) OSSwapBigToHostInt32(x)
+# define le32toh(x) OSSwapLittleToHostInt32(x)
+
+# define htobe64(x) OSSwapHostToBigInt64(x)
+# define htole64(x) OSSwapHostToLittleInt64(x)
+# define be64toh(x) OSSwapBigToHostInt64(x)
+# define le64toh(x) OSSwapLittleToHostInt64(x)
+
+# define __BYTE_ORDER BYTE_ORDER
+# define __BIG_ENDIAN BIG_ENDIAN
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __PDP_ENDIAN PDP_ENDIAN
+
+#elif defined(__OpenBSD__)
+
+# include <endian.h>
+
+# define __BYTE_ORDER BYTE_ORDER
+# define __BIG_ENDIAN BIG_ENDIAN
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __PDP_ENDIAN PDP_ENDIAN
+
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+
+# include <sys/endian.h>
+
+# define be16toh(x) betoh16(x)
+# define le16toh(x) letoh16(x)
+
+# define be32toh(x) betoh32(x)
+# define le32toh(x) letoh32(x)
+
+# define be64toh(x) betoh64(x)
+# define le64toh(x) letoh64(x)
+
+#elif defined(__WINDOWS__)
+
+# include <winsock2.h>
+# ifdef __GNUC__
+# include <sys/param.h>
+# endif
+
+# if BYTE_ORDER == LITTLE_ENDIAN
+
+# define htobe16(x) htons(x)
+# define htole16(x) (x)
+# define be16toh(x) ntohs(x)
+# define le16toh(x) (x)
+
+# define htobe32(x) htonl(x)
+# define htole32(x) (x)
+# define be32toh(x) ntohl(x)
+# define le32toh(x) (x)
+
+# define htobe64(x) htonll(x)
+# define htole64(x) (x)
+# define be64toh(x) ntohll(x)
+# define le64toh(x) (x)
+
+# elif BYTE_ORDER == BIG_ENDIAN
+
+ /* that would be xbox 360 */
+# define htobe16(x) (x)
+# define htole16(x) __builtin_bswap16(x)
+# define be16toh(x) (x)
+# define le16toh(x) __builtin_bswap16(x)
+
+# define htobe32(x) (x)
+# define htole32(x) __builtin_bswap32(x)
+# define be32toh(x) (x)
+# define le32toh(x) __builtin_bswap32(x)
+
+# define htobe64(x) (x)
+# define htole64(x) __builtin_bswap64(x)
+# define be64toh(x) (x)
+# define le64toh(x) __builtin_bswap64(x)
+
+# else
+
+# error byte order not supported
+
+# endif
+
+# define __BYTE_ORDER BYTE_ORDER
+# define __BIG_ENDIAN BIG_ENDIAN
+# define __LITTLE_ENDIAN LITTLE_ENDIAN
+# define __PDP_ENDIAN PDP_ENDIAN
+
+#elif defined(__QNXNTO__)
+
+# include <gulliver.h>
+
+# define __LITTLE_ENDIAN 1234
+# define __BIG_ENDIAN 4321
+# define __PDP_ENDIAN 3412
+
+# if defined(__BIGENDIAN__)
+
+# define __BYTE_ORDER __BIG_ENDIAN
+
+# define htobe16(x) (x)
+# define htobe32(x) (x)
+# define htobe64(x) (x)
+
+# define htole16(x) ENDIAN_SWAP16(x)
+# define htole32(x) ENDIAN_SWAP32(x)
+# define htole64(x) ENDIAN_SWAP64(x)
+
+# elif defined(__LITTLEENDIAN__)
+
+# define __BYTE_ORDER __LITTLE_ENDIAN
+
+# define htole16(x) (x)
+# define htole32(x) (x)
+# define htole64(x) (x)
+
+# define htobe16(x) ENDIAN_SWAP16(x)
+# define htobe32(x) ENDIAN_SWAP32(x)
+# define htobe64(x) ENDIAN_SWAP64(x)
+
+# else
+
+# error byte order not supported
+
+# endif
+
+# define be16toh(x) ENDIAN_BE16(x)
+# define be32toh(x) ENDIAN_BE32(x)
+# define be64toh(x) ENDIAN_BE64(x)
+# define le16toh(x) ENDIAN_LE16(x)
+# define le32toh(x) ENDIAN_LE32(x)
+# define le64toh(x) ENDIAN_LE64(x)
+
+#else
+
+# error platform not supported
+
+#endif
+
+#endif

0 comments on commit 3bd3ae1

Please sign in to comment.