Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changelog: Release opkg-lede 0+git20190131.d4ba162-5 | Patrick McDermott | 2019-04-06 | 1 | -0/+15 |
| | |||||
* | opkg-lede: Essential: yes | Patrick McDermott | 2019-04-06 | 1 | -0/+1 |
| | |||||
* | opkg: Use Conflicts instead of Breaks | Patrick McDermott | 2019-04-06 | 1 | -2/+2 |
| | |||||
* | opkg-lede.pkg/files: Update | Patrick McDermott | 2019-04-06 | 1 | -3/+3 |
| | |||||
* | opkg-lede: Replace and break original opkg packages | Patrick McDermott | 2019-04-06 | 1 | -0/+2 |
| | |||||
* | opkg: Un-u-a executables | Patrick McDermott | 2019-04-06 | 2 | -11/+3 |
| | |||||
* | Revert "build: Make /usr/bin/opkg link" | Patrick McDermott | 2019-04-06 | 1 | -3/+0 |
| | | | | | | This reverts commit 0647ef7db57768316dc89e1e67c6fde14b35a738. This won't work well with u-a on removals. | ||||
* | build: Make /usr/bin/opkg link | Patrick McDermott | 2019-04-06 | 1 | -0/+3 |
| | |||||
* | build: Add " for ProteanOS" to version string | Patrick McDermott | 2019-04-06 | 1 | -1/+2 |
| | |||||
* | patches, build: Don't add list files suffix | Patrick McDermott | 2019-04-06 | 2 | -64/+0 |
| | | | | This should be done in opkg.conf instead. | ||||
* | control: B-D on patch | Patrick McDermott | 2019-04-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quoth ob-applypatches: ob-applypatches: Applying patch "0001-cli-Set-default-conf-file-path-in-build-system.patch"... patching file CMakeLists.txt patching file src/opkg-cl.c ob-applypatches: Applying patch "0002-build-Allow-overriding-opkg-state-dir-prefix.patch"... patching file CMakeLists.txt ob-applypatches: Applying patch "0003-cli-Optionally-enforce-argument-to-upgrade-command.patch"... patching file CMakeLists.txt patching file libopkg/opkg_cmd.c patching file src/opkg-cl.c ob-applypatches: Applying patch "0004-libopkg-Fix-segfault-on-trailing-comma-in-deps.patch"... patching file libopkg/pkg_depends.c ob-applypatches: Applying patch "0005-libopkg-Detect-gzipped-pkg-lists-by-magic-number.patch"... patching file libbb/gzip.h patching file libopkg/pkg_hash.c Possibly reversed hunk 1 at 761 Hunk 1 FAILED 99/99. { pkg_t *pkg; FILE *fp; + char magic[2]; + int is_gzip = 0; char *buf; const size_t len = 4096; int ret = 0; struct gzip_handle zh; - if (src && src->gzip) { - fp = gzip_fdopen(&zh, file_name); - } else { - fp = fopen(file_name, "r"); - } - + fp = fopen(file_name, "r"); if (fp == NULL) { opkg_perror(ERROR, "Failed to open %s", file_name); return -1; } + if (fread(magic, 1, 2, fp) != 2) { + opkg_perror(ERROR, "Failed to read %s", file_name); + fclose(fp); + return -1; + } + (void)fseek(fp, 0L, SEEK_SET); + + if (src && src->gzip && memcmp(magic, GZIP_MAGIC, 2) == 0) { + fclose(fp); + fp = gzip_fdopen(&zh, file_name); + if (fp == NULL) { + opkg_perror(ERROR, "Failed to open %s", file_name); + return -1; + } + is_gzip = 1; + } buf = xmalloc(len); ob-applypatches: Error: Can't apply patch "0005-libopkg-Detect-gzipped-pkg-lists-by-magic-number.patch" | ||||
* | build: Set LIST_FILES_SUFFIX | Patrick McDermott | 2019-04-06 | 1 | -0/+1 |
| | |||||
* | patches: Detect and optionally suffix gzipped lists | Patrick McDermott | 2019-04-06 | 2 | -0/+144 |
| | |||||
* | patches: Apply sequentially | Patrick McDermott | 2019-04-06 | 4 | -12/+12 |
| | |||||
* | build: Override opkg state dir prefix | Patrick McDermott | 2019-04-06 | 1 | -0/+1 |
| | |||||
* | patches: Allow overriding opkg state dir prefix | Patrick McDermott | 2019-04-06 | 3 | -0/+34 |
| | |||||
* | patches: Fix segfault on trailing comma in deps | Patrick McDermott | 2019-04-06 | 1 | -0/+39 |
| | |||||
* | changelog: Release opkg-lede 0+git20190131.d4ba162-4 | Patrick McDermott | 2019-04-05 | 2 | -1/+7 |
| | |||||
* | changelog: Release opkg-lede 0+git20190131.d4ba162-3 | Patrick McDermott | 2019-04-05 | 1 | -0/+6 |
| | |||||
* | opkg-lede-dbg: New binary package | Patrick McDermott | 2019-04-05 | 4 | -7/+17 |
| | | | | And shorten short description and substvarize common description. | ||||
* | changelog: Release opkg-lede 0+git20190131.d4ba162-2 | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | opkg-lede: Conflict with opkg-common, not opkg and opkg-gpg | Patrick McDermott | 2019-04-04 | 2 | -2/+2 |
| | |||||
* | build: Make verbose differently | Patrick McDermott | 2019-04-04 | 1 | -1/+2 |
| | |||||
* | build: Make verbose | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | patches: Fix CMake if() command expression | Patrick McDermott | 2019-04-04 | 1 | -3/+3 |
| | |||||
* | patches: Fix CMake OPTION() syntax | Patrick McDermott | 2019-04-04 | 1 | -3/+3 |
| | | | | | | | | | Fixes: CMake Warning: Manually-specified variables were not used by the project: REQUIRE_UPGRADE_ARGS | ||||
* | opkg-lede: Update files patterns | Patrick McDermott | 2019-04-04 | 1 | -2/+2 |
| | |||||
* | patches: Fix syntax error | Patrick McDermott | 2019-04-04 | 1 | -3/+3 |
| | | | | I guess I've spent too much time with Perl. | ||||
* | patches: Add a missing S-o-b | Patrick McDermott | 2019-04-04 | 1 | -1/+2 |
| | |||||
* | patches, build: Allow upgrade command without arguments | Patrick McDermott | 2019-04-04 | 3 | -0/+93 |
| | |||||
* | opkg-lede: Conflict with opkg and opkg-gpg (<< 0.2.4-2) | Patrick McDermott | 2019-04-04 | 2 | -0/+2 |
| | |||||
* | build: Fix comment | Patrick McDermott | 2019-04-04 | 1 | -1/+2 |
| | |||||
* | build, opkg-lede: Manage opkg-key and u-a with u-a | Patrick McDermott | 2019-04-04 | 3 | -3/+7 |
| | | | | How meta. | ||||
* | build: Set lock file path to /var/lib/opkg/lock | Patrick McDermott | 2019-04-04 | 2 | -0/+3 |
| | |||||
* | build: Fix missing backslash | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | patches, build: Set default conf file path to /etc/opkg/opkg.conf | Patrick McDermott | 2019-04-04 | 3 | -0/+54 |
| | |||||
* | changelog: Release opkg-lede 0+git20190131.d4ba162-1 | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | build: Use OpenWrt's opkg-key (which uses usign) | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | opkg-key: New file | Patrick McDermott | 2019-04-04 | 1 | -0/+56 |
| | | | | https://git.openwrt.org/?p=openwrt/openwrt.git;a=blob_plain;f=package/system/opkg/files/opkg-key;h=ae5e8a4591078764352ae766000f92e8230265fb;hb=beca028bd6bb71898052faadff680d8e76f61eb3 | ||||
* | copyright: New file | Patrick McDermott | 2019-04-04 | 1 | -0/+144 |
| | |||||
* | build: Set BUILD_TESTS to OFF | Patrick McDermott | 2019-04-04 | 1 | -2/+6 |
| | |||||
* | build: Set version string | Patrick McDermott | 2019-04-04 | 1 | -1/+4 |
| | |||||
* | source.mk: Fix version string sed command | Patrick McDermott | 2019-04-04 | 1 | -1/+1 |
| | |||||
* | Initial commit | Patrick McDermott | 2019-04-04 | 10 | -0/+74 |