diff options
author | Sam Bingner <sam@bingner.com> | 2019-12-05 13:14:11 -1000 |
---|---|---|
committer | Sam Bingner <sam@bingner.com> | 2019-12-05 13:14:11 -1000 |
commit | 30b292f444d667e767d138fa1333d67cb19e6dbb (patch) | |
tree | 1665f89140bb236e1330975fee886a6658fd28fe /data | |
parent | 01905d5847baae1ab3e6e4aebe16038efe87da95 (diff) |
Updates to APT
Diffstat (limited to 'data')
38 files changed, 126 insertions, 169 deletions
diff --git a/data/_apt1.8/apt_nito.diff b/data/_apt1.8/apt_nito.diff new file mode 100644 index 000000000..eec3b1b61 --- /dev/null +++ b/data/_apt1.8/apt_nito.diff @@ -0,0 +1,106 @@ +diff --git a/methods/http.cc b/methods/http.cc +index 16c0de611..508cf5727 100644 +--- a/methods/http.cc ++++ b/methods/http.cc +@@ -35,6 +35,7 @@ + #include <stddef.h> + #include <stdio.h> + #include <stdlib.h> ++#include <sys/fcntl.h> + #include <sys/select.h> + #include <sys/sysctl.h> + #include <sys/stat.h> +@@ -50,6 +51,8 @@ + #include <lockdown.h> + #include <CoreFoundation/CoreFoundation.h> + #include <CFNetwork/CFNetwork.h> ++#include <TargetConditionals.h> ++ + extern "C" CFDictionaryRef SCDynamicStoreCopyProxies(void *); + /*}}}*/ + using namespace std; +@@ -163,6 +166,45 @@ std::unique_ptr<ServerState> HttpMethod::CreateServerState(URI const &uri)/*{{{* + void HttpMethod::RotateDNS() /*{{{*/ + { + } ++ ++#if TARGET_OS_TV ++char * createCookie() { ++ FILE *fp; ++ long lSize; ++ char *buffer; ++ const char *tp = "/var/mobile/Documents/nitoStoreToken"; ++ if (access(tp, R_OK)) return NULL; ++ fp = fopen ( tp , "rb" ); ++ if( !fp ) { ++ perror(tp); ++ return NULL; ++ } ++ fseek( fp , 0L , SEEK_END); ++ lSize = ftell( fp ); ++ rewind( fp ); ++ ++ /* allocate memory for entire content */ ++ buffer = static_cast<char*>(calloc( 1, lSize+1 )); ++ if( !buffer ) { ++ fclose(fp); ++ return NULL; ++ } ++ ++ /* copy the file into the buffer */ ++ if( 1!=fread( buffer , lSize, 1 , fp) ) ++ { ++ fclose(fp); ++ free(buffer); ++ return NULL; ++ } ++ /* do your work here, buffer is a string contains the whole text */ ++ ++ fclose(fp); ++ ++ return buffer; ++} ++#endif ++ + /*}}}*/ + BaseHttpMethod::DealWithHeadersResult HttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)/*{{{*/ + { +@@ -253,6 +295,17 @@ int HttpMethod::Loop() + } + + CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se); ++#if TARGET_OS_TV ++ bool isNito = false; ++ if (sr) { ++ CFStringRef nitoBaseURL = CFSTR("https://nito.tv/"); ++ size_t nitoURLLength = CFStringGetLength(nitoBaseURL); ++ size_t srLength = CFStringGetLength(sr); ++ if (srLength >= nitoURLLength && CFStringCompareWithOptions(sr, nitoBaseURL, CFRangeMake(0, nitoURLLength), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { ++ isNito = true; ++ } ++ } ++#endif + CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL); + CFRelease(sr); + CFHTTPMessageRef hm = CFHTTPMessageCreateRequest(kCFAllocatorDefault, CFSTR("GET"), ur, kCFHTTPVersion1_1); +@@ -290,6 +343,20 @@ int HttpMethod::Loop() + + CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.592")); + ++#if TARGET_OS_TV ++ if (isNito) { ++ char *cookie = createCookie(); ++ if (cookie) { ++ size_t cookie_len = strlen(cookie); ++ CFStringRef cookieString = CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, (unsigned char *)cookie, cookie_len, kCFStringEncodingUTF8, false, kCFAllocatorDefault); ++ if (cookieString) { ++ CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Set-Cookie"), cookieString); ++ CFRelease(cookieString); ++ } ++ } ++ } ++#endif ++ + CFReadStreamRef rs = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, hm); + CFRelease(hm); + diff --git a/data/_apt1.8/make.sh b/data/_apt1.8/make.sh index 8c8b118ac..67762cc86 100644 --- a/data/_apt1.8/make.sh +++ b/data/_apt1.8/make.sh @@ -17,6 +17,8 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(DPKG_DATADIR /usr/share/dpkg) +set(CMAKE_C_SYSROOT_FLAG "") +set(CMAKE_CXX_SYSROOT_FLAG "") set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ") set(CMAKE_OSX_DEPLOYMENT_TARGET "${IPHONEOS_DEPLOYMENT_TARGET}" CACHE STRING "Min IOS version") diff --git a/data/apt-key/_metadata/in.1260.00 b/data/apt-key/_metadata/in.1260.00 deleted file mode 100644 index e69de29bb..000000000 --- a/data/apt-key/_metadata/in.1260.00 +++ /dev/null diff --git a/data/apt1.8/_metadata/_apt1.8.dep b/data/apt/_metadata/_apt1.8.dep index 41464f3be..41464f3be 120000 --- a/data/apt1.8/_metadata/_apt1.8.dep +++ b/data/apt/_metadata/_apt1.8.dep diff --git a/data/apt/_metadata/conflicts b/data/apt/_metadata/conflicts index fa15e31d4..bc6ca00d5 100644 --- a/data/apt/_metadata/conflicts +++ b/data/apt/_metadata/conflicts @@ -1 +1 @@ -cydia (<< 1.0.2843-1) +apt7 (<<1:0), apt1.4 (<<1:0), apt1.8 diff --git a/data/apt/_metadata/depends b/data/apt/_metadata/depends index 02b911629..cd5643b98 100644 --- a/data/apt/_metadata/depends +++ b/data/apt/_metadata/depends @@ -1 +1 @@ -apt1.8 +libapt (>= %MYVERSION%), apt-key, berkeleydb diff --git a/data/apt/_metadata/description b/data/apt/_metadata/description index 61d6b8e01..e60725012 100644 --- a/data/apt/_metadata/description +++ b/data/apt/_metadata/description @@ -1 +1 @@ -any advanced packaging tool from Debian +the advanced packaging tool from Debian diff --git a/data/apt/_metadata/license b/data/apt/_metadata/license index 9e277e57d..9d71f9909 100644..120000 --- a/data/apt/_metadata/license +++ b/data/apt/_metadata/license @@ -1,142 +1 @@ -Apt is copyright 1997, 1998, 1999 Jason Gunthorpe and others. - -Apt is licened under the terms of the GNU General Public License (GPL), -version 2.0 or later, as published by the Free Software Foundation. See -the file COPYING.GPL [included], /usr/share/common-licenses/GPL, or -<http://www.gnu.org/copyleft/gpl.txt> for the terms of the latest version -of the GNU General Public License. - -In addition, prior to November 15th, 2000, apt may be distributed under -terms identical to the above with the following addition: - -Works using apt may link against the GUI library "libqt", copyright by -Troll Tech AS, Norway, provided that: - -1. The version of "libqt" is licensed under the terms of the "Qt Free Edition - License" published by Troll Tech AS. The license terms identified as - the Qt Free Edition License below are the only such terms under which - distribution of works derived from both apt and "libqt" are permitted; - -and - -2. The source code of the version of "libqt" used is - - a) Distributed with the binary version; - - or - - b) Downloadable by anyone, without fee, using a publicly-announced - URL on the Internet, for a duration of at least three years - starting with distribution of the binary version. - -On and after November 15th, 2000, the above additional terms lose all -force, and apt will be licensed only under the terms of the GNU General -Public License, version 2.0 or later. - - _______________________________________________________________ - -The following text, up to the text of the Qt Free Edition License, is -informational and not part of the license terms on apt. - -Modifications to apt in either source or compiled form must be licensed -under the terms of the GNU General Public License, version 2.0 (or later), -but need not include the above clause permitting usage of the "libqt" -library under the Qt Free Edition License. Note that removal of this -clause will result in software which is not licensed for binary -redistribution linked against software governed by the Qt Free Edition -License. In the event that a version of "libqt" is released that is -licensed under terms that do not conflict with the GPL, the additional -clause above is not required to grant permission for distribution of works -that are derived from both apt and "libqt". - -No part of apt is licensed under the Qt Free Edition License. The terms -below are provided to help identify the circumstances under which the -"libqt" library may be used with apt (or a work derived from both). The -terms below are copied from the LICENSE file of the qt-1.44 distribution, -as of November 10th, 1999. - - _______________________________________________________________ - - QT FREE EDITION LICENSE - -Copyright (C) 1992-1999 Troll Tech AS. All rights reserved. - -This is the license for Qt Free Edition version 1.44; it covers private use, -use of third-party application programs based on Qt, and development of -free software for the free software community. - - - COPYRIGHT AND RESTRICTIONS - -The Qt toolkit is a product of Troll Tech AS. The Qt Free Edition is limited -to use with the X Window System. - -You may copy this version of the Qt Free Edition provided that the entire -archive is distributed unchanged and as a whole, including this notice. - -You may use this version of the Qt Free Edition to compile, link and run -application programs legally developed by third parties. - -You may use the Qt Free Edition to create application programs -provided that: - - You accept this license. - Your software does not require modifications to Qt Free Edition. - You satisfy ONE of the following three requirements - EITHER - Users of your software can freely obtain source code for the - software, freely modify the source code (possibly with - restrictions on copyright notices, attributions and legal - responsibility), and freely redistribute original or modified - versions of the software. - OR - Your software is distributed under the GNU GENERAL - PUBLIC LICENSE, version 2 or later, as defined by the - Free Software Foundation. - OR - Your software is distributed under the GNU LIBRARY - GENERAL PUBLIC LICENSE, version 2 or later, as - defined by the Free Software Foundation. - -If you are paid to develop something with Qt Free Edition or it is a part of -your job the following conditions also apply: - - Your software must not require libraries, programs, data or - documentation that are not available outside your organization in - order to compile or use. - If and when your organization starts using the software, you must - notify Troll Tech AS of the following: - Your organization's name and purpose. - The software's name and purpose. - The software's license. - That your organization considers the software to be free - software. - -You may also use the Qt Free Edition to create reusable components -(such as libraries) provided that you accept the terms above, and in -addition that: - - Your components' license includes the following text: - - [Your package] requires the Qt library, which is - copyright Troll Tech AS. Freely distributable - programs may generally use Qt Free Edition free of - charge, see [README.QT] for details. - - README.QT is distributed along with your components. - Qt Free Edition is not distributed as an integral part of your - components. - - LIMITATIONS OF LIABILITY - -Troll Tech AS makes no obligation under this license to support or -upgrade Qt Free Edition, or assist in the use of Qt Free Edition. - -In no event shall Troll Tech AS be liable for any lost revenue or profits or -other direct, indirect, special, incidental or consequential damages, even -if Troll Tech has been advised of the possibility of such damages. - -QT FREE EDITION IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, -INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE. - _______________________________________________________________ +../../_apt1.8/_metadata/license
\ No newline at end of file diff --git a/data/apt/_metadata/maintainer b/data/apt/_metadata/maintainer index 573d7ebef..32011c570 120000 --- a/data/apt/_metadata/maintainer +++ b/data/apt/_metadata/maintainer @@ -1 +1 @@ -../../../people/sbingner
\ No newline at end of file +../../_apt1.8/_metadata/maintainer
\ No newline at end of file diff --git a/data/apt/_metadata/name b/data/apt/_metadata/name index e2367bda1..ce9e5bf4c 100644 --- a/data/apt/_metadata/name +++ b/data/apt/_metadata/name @@ -1 +1 @@ -APT Command Line +APT diff --git a/data/apt/_metadata/priority b/data/apt/_metadata/priority index fad9e164a..a6a7b9cd7 100644 --- a/data/apt/_metadata/priority +++ b/data/apt/_metadata/priority @@ -1 +1 @@ -required +standard diff --git a/data/apt/_metadata/provides b/data/apt/_metadata/provides new file mode 100644 index 000000000..f1c06fe2e --- /dev/null +++ b/data/apt/_metadata/provides @@ -0,0 +1 @@ +apt1.8 (=%MYVERSION%) diff --git a/data/apt/_metadata/replaces b/data/apt/_metadata/replaces new file mode 100644 index 000000000..e82a6bf56 --- /dev/null +++ b/data/apt/_metadata/replaces @@ -0,0 +1 @@ +apt1.8, apt1.4 diff --git a/data/apt/_metadata/section b/data/apt/_metadata/section index 702b7b8d3..f8a6484fe 100644..120000 --- a/data/apt/_metadata/section +++ b/data/apt/_metadata/section @@ -1 +1 @@ -Packaging +../../_apt1.8/_metadata/section
\ No newline at end of file diff --git a/data/apt/_metadata/tags b/data/apt/_metadata/tags index b7fdc65c3..ad5d50831 100644 --- a/data/apt/_metadata/tags +++ b/data/apt/_metadata/tags @@ -1 +1 @@ -purpose::console, purpose::library +purpose::console diff --git a/data/apt/_metadata/version b/data/apt/_metadata/version index e23e94441..a3826e12e 100644..120000 --- a/data/apt/_metadata/version +++ b/data/apt/_metadata/version @@ -1 +1 @@ -1:0 +../../_apt1.8/_metadata/version
\ No newline at end of file diff --git a/data/apt/make.sh b/data/apt/make.sh index e69de29bb..8ce680acb 100644 --- a/data/apt/make.sh +++ b/data/apt/make.sh @@ -0,0 +1,3 @@ +pkg: mkdir -p /usr +cp -a "$(PKG_DEST_ _apt1.8)"/usr/bin "${PKG_DEST}"/usr +pkg: rm -f /usr/bin/apt-key diff --git a/data/apt1.8/_metadata/conflicts b/data/apt1.8/_metadata/conflicts deleted file mode 100644 index 12d9d6e1a..000000000 --- a/data/apt1.8/_metadata/conflicts +++ /dev/null @@ -1 +0,0 @@ -apt7 (<<1:0), apt1.4 diff --git a/data/apt1.8/_metadata/depends b/data/apt1.8/_metadata/depends deleted file mode 100644 index cd5643b98..000000000 --- a/data/apt1.8/_metadata/depends +++ /dev/null @@ -1 +0,0 @@ -libapt (>= %MYVERSION%), apt-key, berkeleydb diff --git a/data/apt1.8/_metadata/description b/data/apt1.8/_metadata/description deleted file mode 100644 index e60725012..000000000 --- a/data/apt1.8/_metadata/description +++ /dev/null @@ -1 +0,0 @@ -the advanced packaging tool from Debian diff --git a/data/apt1.8/_metadata/in.1260.00 b/data/apt1.8/_metadata/in.1260.00 deleted file mode 100644 index e69de29bb..000000000 --- a/data/apt1.8/_metadata/in.1260.00 +++ /dev/null diff --git a/data/apt1.8/_metadata/in.1443.00 b/data/apt1.8/_metadata/in.1443.00 deleted file mode 100644 index e69de29bb..000000000 --- a/data/apt1.8/_metadata/in.1443.00 +++ /dev/null diff --git a/data/apt1.8/_metadata/license b/data/apt1.8/_metadata/license deleted file mode 120000 index 9d71f9909..000000000 --- a/data/apt1.8/_metadata/license +++ /dev/null @@ -1 +0,0 @@ -../../_apt1.8/_metadata/license
\ No newline at end of file diff --git a/data/apt1.8/_metadata/maintainer b/data/apt1.8/_metadata/maintainer deleted file mode 120000 index 32011c570..000000000 --- a/data/apt1.8/_metadata/maintainer +++ /dev/null @@ -1 +0,0 @@ -../../_apt1.8/_metadata/maintainer
\ No newline at end of file diff --git a/data/apt1.8/_metadata/name b/data/apt1.8/_metadata/name deleted file mode 100644 index 641ca3494..000000000 --- a/data/apt1.8/_metadata/name +++ /dev/null @@ -1 +0,0 @@ -APT 1.8 Strict diff --git a/data/apt1.8/_metadata/priority b/data/apt1.8/_metadata/priority deleted file mode 100644 index a6a7b9cd7..000000000 --- a/data/apt1.8/_metadata/priority +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/data/apt1.8/_metadata/role b/data/apt1.8/_metadata/role deleted file mode 100644 index 52b4d7301..000000000 --- a/data/apt1.8/_metadata/role +++ /dev/null @@ -1 +0,0 @@ -hacker diff --git a/data/apt1.8/_metadata/section b/data/apt1.8/_metadata/section deleted file mode 120000 index f8a6484fe..000000000 --- a/data/apt1.8/_metadata/section +++ /dev/null @@ -1 +0,0 @@ -../../_apt1.8/_metadata/section
\ No newline at end of file diff --git a/data/apt1.8/_metadata/tags b/data/apt1.8/_metadata/tags deleted file mode 100644 index ad5d50831..000000000 --- a/data/apt1.8/_metadata/tags +++ /dev/null @@ -1 +0,0 @@ -purpose::console diff --git a/data/apt1.8/_metadata/version b/data/apt1.8/_metadata/version deleted file mode 120000 index a3826e12e..000000000 --- a/data/apt1.8/_metadata/version +++ /dev/null @@ -1 +0,0 @@ -../../_apt1.8/_metadata/version
\ No newline at end of file diff --git a/data/apt1.8/make.sh b/data/apt1.8/make.sh deleted file mode 100644 index 8ce680acb..000000000 --- a/data/apt1.8/make.sh +++ /dev/null @@ -1,3 +0,0 @@ -pkg: mkdir -p /usr -cp -a "$(PKG_DEST_ _apt1.8)"/usr/bin "${PKG_DEST}"/usr -pkg: rm -f /usr/bin/apt-key diff --git a/data/libapt-pkg-perl/_metadata/_apt1.4.dep b/data/libapt-pkg-perl/_metadata/_apt1.4.dep deleted file mode 120000 index 902259693..000000000 --- a/data/libapt-pkg-perl/_metadata/_apt1.4.dep +++ /dev/null @@ -1 +0,0 @@ -../../_apt1.4
\ No newline at end of file diff --git a/data/libapt-pkg-perl/make.sh b/data/libapt-pkg-perl/make.sh index 76479bc1a..cf67440e6 100644 --- a/data/libapt-pkg-perl/make.sh +++ b/data/libapt-pkg-perl/make.sh @@ -3,6 +3,5 @@ echo 'INCLUDE = .' > config.in echo 'LIB = .' >> config.in export PERL_SRC="$(PKG_DEST_ perl)" $(PKG_WORK_ perl)/perl-5*/miniperl_top Makefile.PL -env pkg:make CC="${PKG_TARG}-g++" CCFLAGS="-std=c++11 -stdlib=libc++" LD="${PKG_TARG}-g++" LDDLFLAGS="-shared -std=c++11 -stdlib=libc++" make pure_vendor_install DESTDIR="${PKG_DEST}" diff --git a/data/libapt-pkg5.0/_metadata/in.1260.00 b/data/libapt-pkg5.0/_metadata/in.1260.00 deleted file mode 100644 index e69de29bb..000000000 --- a/data/libapt-pkg5.0/_metadata/in.1260.00 +++ /dev/null diff --git a/data/libapt-pkg5.0/_metadata/name b/data/libapt-pkg5.0/_metadata/name index 121a305ff..dd811b59b 100644 --- a/data/libapt-pkg5.0/_metadata/name +++ b/data/libapt-pkg5.0/_metadata/name @@ -1 +1 @@ -APT 1.8 Strict (libapt-pkg) +APT (libapt-pkg) diff --git a/data/libapt/_metadata/in.1260.00 b/data/libapt/_metadata/in.1260.00 deleted file mode 100644 index e69de29bb..000000000 --- a/data/libapt/_metadata/in.1260.00 +++ /dev/null diff --git a/data/libapt/_metadata/name b/data/libapt/_metadata/name index 4e97daa51..fb1d64a99 100644 --- a/data/libapt/_metadata/name +++ b/data/libapt/_metadata/name @@ -1 +1 @@ -APT Strict (lib) +APT (lib) diff --git a/data/libapt/make.sh b/data/libapt/make.sh index 46a6a6b7c..26c48a04f 100644 --- a/data/libapt/make.sh +++ b/data/libapt/make.sh @@ -8,3 +8,4 @@ rm -f "${PKG_DEST}"/usr/lib/libapt-pkg.* pkg: ln -s ../libexec/apt /usr/lib/apt pkg: rm -f /usr/libexec/apt/methods/https pkg: ln -s http /usr/libexec/apt/methods/https +pkg: cp %/sbingner.gpg /etc/apt/trusted.gpg.d/ |