summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* patches: Allow u-a to manage /usr/bin/[Patrick McDermott2020-12-072-0/+13
|
* patches: libopkg: fix md5sum calculationPatrick McDermott2020-12-072-0/+53
|
* release: New script (copied from gcc-8)Patrick McDermott2020-12-061-0/+13
|
* Revert "Make opkg-cl and u-a run saved busybox sh link"Patrick McDermott2020-11-233-21/+1
| | | | | | | | | This reverts commit d711e8cd5e0d7186dad840b9883a97a93f2dd383. busybox won't [1] manage /bin/sh with u-a, because that's just too crazy. [1]: http://git.proteanos.com/pkg/busybox.git/commit/?id=3e821b1d665132be24e0185c2c6885f6e2b616eb
* Make opkg-cl and u-a run saved busybox sh linkPatrick McDermott2020-11-233-1/+21
|
* opkg: Save /bin/busybox and make linksPatrick McDermott2020-11-222-4/+51
| | | | | | | | | This works around a regression in opkg-lede that thoroughly breaks upgrading the busybox package and also allows all of busybox's utility links to be managed using update-alternatives. /bin/busybox is copied instead of hard linked, because /var might be on a separate file system (e.g. tmpfs).
* opkg: New multiarch support wrapper scriptPatrick McDermott2020-06-184-1/+100
|
* changelog: Release opkg-lede 0+git20190131.d4ba162-6Patrick McDermott2019-04-271-1/+1
|
* opkg-lede: Move conf file in postinstPatrick McDermott2019-04-172-0/+9
|
* patches/0001-cli-Set-default-conf-file-path-in-build-system.patch: DropPatrick McDermott2019-04-173-48/+2
|
* Revert "build: Install intercepts"Patrick McDermott2019-04-171-2/+0
| | | | This reverts commit dcad0c89d7d409eff31d1f654038ffc342b0140a.
* build: Install interceptsPatrick McDermott2019-04-171-0/+2
|
* changelog: Add package name prefixPatrick McDermott2019-04-171-1/+2
|
* changelog: Note Replaces/Conflicts changesPatrick McDermott2019-04-171-0/+1
|
* opkg-lede: Drop conflict that is a subset of anotherPatrick McDermott2019-04-171-2/+1
|
* opkg-lede: Drop ReplacesPatrick McDermott2019-04-171-1/+0
|
* changelog: Add 0+git20190131.d4ba162-6 entryPatrick McDermott2019-04-171-0/+6
|
* opkg-lede: Update files listPatrick McDermott2019-04-171-1/+2
|
* opkg-key: RemovePatrick McDermott2019-04-171-56/+0
|
* build: Link /usr/sbin/opkg-key to /usr/bin/opkg-certPatrick McDermott2019-04-171-0/+2
|
* opkg-cert: Accept gunzip path from environmentPatrick McDermott2019-04-161-2/+2
|
* build: Install opkg-certPatrick McDermott2019-04-161-2/+1
|
* opkg-cert: AddPatrick McDermott2019-04-161-0/+329
|
* changelog: Release opkg-lede 0+git20190131.d4ba162-5Patrick McDermott2019-04-061-0/+15
|
* opkg-lede: Essential: yesPatrick McDermott2019-04-061-0/+1
|
* opkg: Use Conflicts instead of BreaksPatrick McDermott2019-04-061-2/+2
|
* opkg-lede.pkg/files: UpdatePatrick McDermott2019-04-061-3/+3
|
* opkg-lede: Replace and break original opkg packagesPatrick McDermott2019-04-061-0/+2
|
* opkg: Un-u-a executablesPatrick McDermott2019-04-062-11/+3
|
* Revert "build: Make /usr/bin/opkg link"Patrick McDermott2019-04-061-3/+0
| | | | | | This reverts commit 0647ef7db57768316dc89e1e67c6fde14b35a738. This won't work well with u-a on removals.
* build: Make /usr/bin/opkg linkPatrick McDermott2019-04-061-0/+3
|
* build: Add " for ProteanOS" to version stringPatrick McDermott2019-04-061-1/+2
|
* patches, build: Don't add list files suffixPatrick McDermott2019-04-062-64/+0
| | | | This should be done in opkg.conf instead.
* control: B-D on patchPatrick McDermott2019-04-061-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_SUFFIXPatrick McDermott2019-04-061-0/+1
|
* patches: Detect and optionally suffix gzipped listsPatrick McDermott2019-04-062-0/+144
|
* patches: Apply sequentiallyPatrick McDermott2019-04-064-12/+12
|
* build: Override opkg state dir prefixPatrick McDermott2019-04-061-0/+1
|
* patches: Allow overriding opkg state dir prefixPatrick McDermott2019-04-063-0/+34
|
* patches: Fix segfault on trailing comma in depsPatrick McDermott2019-04-061-0/+39
|
* changelog: Release opkg-lede 0+git20190131.d4ba162-4Patrick McDermott2019-04-052-1/+7
|
* changelog: Release opkg-lede 0+git20190131.d4ba162-3Patrick McDermott2019-04-051-0/+6
|
* opkg-lede-dbg: New binary packagePatrick McDermott2019-04-054-7/+17
| | | | And shorten short description and substvarize common description.
* changelog: Release opkg-lede 0+git20190131.d4ba162-2Patrick McDermott2019-04-041-1/+1
|
* opkg-lede: Conflict with opkg-common, not opkg and opkg-gpgPatrick McDermott2019-04-042-2/+2
|
* build: Make verbose differentlyPatrick McDermott2019-04-041-1/+2
|
* build: Make verbosePatrick McDermott2019-04-041-1/+1
|
* patches: Fix CMake if() command expressionPatrick McDermott2019-04-041-3/+3
|
* patches: Fix CMake OPTION() syntaxPatrick McDermott2019-04-041-3/+3
| | | | | | | | | Fixes: CMake Warning: Manually-specified variables were not used by the project: REQUIRE_UPGRADE_ARGS
* opkg-lede: Update files patternsPatrick McDermott2019-04-041-2/+2
|
[next]
generated by cgit v0.9.1 at 2024-11-26 08:32:07 (EST)