From 4cdaedd34c83ee5d847096f9470cd899676a94c1 Mon Sep 17 00:00:00 2001
From: gixxpunk <gandharva@gmx.de>
Date: Mon, 30 Oct 2017 15:35:28 +0100
Subject: [PATCH] - cleanup

---
 ...bsi++-fix-unaligned-access-on-SuperH.patch | 19 -------------------
 .../vsftpd-musl-compatibility.patch           | 13 -------------
 make/system-libs.mk                           |  1 -
 make/system-tools.mk                          |  1 -
 4 files changed, 34 deletions(-)
 delete mode 100644 archive-patches/libdvbsi++-fix-unaligned-access-on-SuperH.patch
 delete mode 100644 archive-patches/vsftpd-musl-compatibility.patch

diff --git a/archive-patches/libdvbsi++-fix-unaligned-access-on-SuperH.patch b/archive-patches/libdvbsi++-fix-unaligned-access-on-SuperH.patch
deleted file mode 100644
index aba3f9a2..00000000
--- a/archive-patches/libdvbsi++-fix-unaligned-access-on-SuperH.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/include/dvbsi++/byte_stream.h b/include/dvbsi++/byte_stream.h
-index 0387a15..204f9a9 100644
---- a/include/dvbsi++/byte_stream.h
-+++ b/include/dvbsi++/byte_stream.h
-@@ -23,8 +23,14 @@
- #define w32(p,v)	do { *(uint32_t * const)(p) = ((const uint32_t)v) } while (0)
- #define w64(p,v)	do { *(uint64_t * const)(p) = ((const uint64_t)v) } while (0)
- #else
-+#ifdef __sh__
-+/* SuperH does not like unaligned accesses, so work around that */
-+#define r16(p)		((((uint8_t *)p)[0]) <<  8 | (((uint8_t *)p)[1]))
-+#define r32(p)		((((uint8_t *)p)[0]) << 24 | (((uint8_t *)p)[1]) << 16 | (((uint8_t *)p)[2]) << 8 | ((uint8_t *)p)[3])
-+#else
- #define r16(p)		bswap_16(*(const uint16_t * const)p)
- #define r32(p)		bswap_32(*(const uint32_t * const)p)
-+#endif
- #define r64(p)		bswap_64(*(const uint64_t * const)p)
- #define w16(p,v)	do { *(uint16_t * const)(p) = bswap_16((const uint16_t)v) } while (0)
- #define w32(p,v)	do { *(uint32_t * const)(p) = bswap_32((const uint32_t)v) } while (0)
diff --git a/archive-patches/vsftpd-musl-compatibility.patch b/archive-patches/vsftpd-musl-compatibility.patch
deleted file mode 100644
index 9eefec79..00000000
--- a/archive-patches/vsftpd-musl-compatibility.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/sysdeputil.c
-+++ b/sysdeputil.c
-@@ -58,7 +58,9 @@
- #define VSF_SYSDEP_HAVE_SHADOW
- #define VSF_SYSDEP_HAVE_USERSHELL
- #define VSF_SYSDEP_HAVE_LIBCAP
--#define VSF_SYSDEP_HAVE_UTMPX
-+#if defined(__GLIBC__) || defined(__UCLIBC__)
-+  #define VSF_SYSDEP_HAVE_UTMPX
-+#endif
- 
- #define __USE_GNU
- #include <utmpx.h>
diff --git a/make/system-libs.mk b/make/system-libs.mk
index 2f82e428..592588b5 100644
--- a/make/system-libs.mk
+++ b/make/system-libs.mk
@@ -67,7 +67,6 @@ $(D)/libdvbsi: | $(TARGETPREFIX)
 	cd $(BUILD_TMP)/libdvbsi++; \
 		$(PATCH)/libdvbsi++-fix-sectionLength-check.patch; \
 		$(PATCH)/libdvbsi++-content_identifier_descriptor.patch; \
-		$(PATCH)/libdvbsi++-fix-unaligned-access-on-SuperH.patch; \
 		$(CONFIGURE) \
 			--prefix= \
 			--enable-shared \
diff --git a/make/system-tools.mk b/make/system-tools.mk
index b982983f..5c80116a 100644
--- a/make/system-tools.mk
+++ b/make/system-tools.mk
@@ -298,7 +298,6 @@ $(D)/vsftpd: $(D)/openssl $(ARCHIVE)/vsftpd-$(VSFTPD_VER).tar.gz | $(TARGETPREFI
 	cd $(BUILD_TMP)/vsftpd-$(VSFTPD_VER) && \
 		$(PATCH)/vsftpd-fix-CVE-2015-1419.patch && \
 		$(PATCH)/vsftpd-disable-capabilities.patch && \
-		$(PATCH)/vsftpd-musl-compatibility.patch && \
 		sed -i -e 's/.*VSF_BUILD_PAM/#undef VSF_BUILD_PAM/' builddefs.h && \
 		sed -i -e 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' builddefs.h && \
 		make clean && \