diff options
| author | Karel Kočí <cynerd@email.cz> | 2020-06-18 10:13:35 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2020-06-18 10:13:35 +0200 |
| commit | 92689a0e8d37330f13018bf04cf53844993f2217 (patch) | |
| tree | 674d5dc28737bccc6933dc0c5888046b1ce9dfbc /libb64 | |
| parent | 72be91b0244697ddea83059194b14456effed737 (diff) | |
| download | openwrt-personal-pkgs-92689a0e8d37330f13018bf04cf53844993f2217.tar.gz openwrt-personal-pkgs-92689a0e8d37330f13018bf04cf53844993f2217.tar.bz2 openwrt-personal-pkgs-92689a0e8d37330f13018bf04cf53844993f2217.zip | |
libb64: fix one off error
Source for patch
https://github.com/libb64/libb64/commit/cc9baa0bee8dc8a5c41faca89f0ebbc70ed0317d
Diffstat (limited to 'libb64')
| -rw-r--r-- | libb64/Makefile | 48 | ||||
| -rw-r--r-- | libb64/patches/fix-one-off-bug.patch | 18 |
2 files changed, 66 insertions, 0 deletions
diff --git a/libb64/Makefile b/libb64/Makefile new file mode 100644 index 0000000..bdad936 --- /dev/null +++ b/libb64/Makefile @@ -0,0 +1,48 @@ +# +## Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) +# +## This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# # +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=libb64 +PKG_VERSION:=1.2.1 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip +PKG_SOURCE_URL:=https://sourceforge.net/projects/libb64/files +PKG_HASH:=20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2 + +PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz> + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +EXTRA_CFLAGS += -fPIC + +define Build/Compile + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR)/src $(MAKE_FLAGS) +endef + +define Host/Compile + $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR)/src $(HOST_MAKE_FLAGS) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/src/libb64.a $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/include/b64 + $(CP) $(PKG_BUILD_DIR)/include/b64/* $(1)/usr/include/b64/ +endef + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/lib + $(CP) $(HOST_BUILD_DIR)/src/libb64.a $(STAGING_DIR_HOST)/usr/lib/ + $(INSTALL_DIR) $(STAGING_DIR_HOST)/usr/include/b64 + $(CP) $(HOST_BUILD_DIR)/include/b64/* $(STAGING_DIR_HOST)/usr/include/b64/ +endef + +$(eval $(call HostBuild)) +$(eval $(call Build/DefaultTargets)) diff --git a/libb64/patches/fix-one-off-bug.patch b/libb64/patches/fix-one-off-bug.patch new file mode 100644 index 0000000..00123bc --- /dev/null +++ b/libb64/patches/fix-one-off-bug.patch @@ -0,0 +1,18 @@ +diff -ur a/src/cdecode.c b/src/cdecode.c +--- a/src/cdecode.c 2013-06-18 14:49:36.000000000 +0200 ++++ b/src/cdecode.c 2020-06-18 10:10:50.033461596 +0200 +@@ -10,10 +10,10 @@ + int base64_decode_value(char value_in) + { + static const char decoding[] = {62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-2,-1,-1,-1,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,-1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51}; +- static const char decoding_size = sizeof(decoding); +- value_in -= 43; +- if (value_in < 0 || value_in >= decoding_size) return -1; +- return decoding[(int)value_in]; ++ if (value_in < '+') return -1; ++ value_in -= '+'; ++ if (value_in >= (char)(sizeof(decoding) / sizeof(*decoding)) ) return -1; ++ return decoding[value_in]; + } + + void base64_init_decodestate(base64_decodestate* state_in) |