- cleanup

archive-patches/libdvbsi++-fix-unaligned-access-on-SuperH.patch

@@ -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)

archive-patches/vsftpd-musl-compatibility.patch

@@ -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>

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 \

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 && \