fix "缺失分隔符。 停止。" #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
del "#"
aiamadeus
pushed a commit
that referenced
this pull request
Dec 12, 2020
Fixes: Applying patch 3-assorted-Makefile-butchery patching file Makefile patching file Makefile.common patching file src/Makefile patching file src/hd/Makefile Hunk #1 succeeded at 8 with fuzz 1 (offset -4 lines). patching file src/isdn/Makefile patching file src/smp/Makefile Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
1715173329
pushed a commit
that referenced
this pull request
Dec 12, 2020
Fixes: Applying patch 3-assorted-Makefile-butchery patching file Makefile patching file Makefile.common patching file src/Makefile patching file src/hd/Makefile Hunk #1 succeeded at 8 with fuzz 1 (offset -4 lines). patching file src/isdn/Makefile patching file src/smp/Makefile Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Closed
1715173329
pushed a commit
that referenced
this pull request
Oct 27, 2021
apxs is used to get information about the apache installation when building external modules. Currently there are issues: 1. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET apache2 apxs:Error: ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/bin/apr-1-config not found!. This error is fixed by sed script #2. 2. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET cannot open ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/share/apache2/build/config_vars.mk: No such file or directory at ./staging_dir/target-mips_24kc_musl/usr/bin/apxs line 213. This error is fixed by sed scipt #1. Both sed scripts taken from buildroot (see [1]). [1] https://github.com/buildroot/buildroot/blob/master/package/apache/apache.mk Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
1715173329
pushed a commit
that referenced
this pull request
Oct 27, 2021
apxs is used to get information about the apache installation when building external modules. Currently there are issues: 1. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET apache2 apxs:Error: ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/bin/apr-1-config not found!. This error is fixed by sed script #2. 2. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET cannot open ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/share/apache2/build/config_vars.mk: No such file or directory at ./staging_dir/target-mips_24kc_musl/usr/bin/apxs line 213. This error is fixed by sed scipt #1. Both sed scripts taken from buildroot (see [1]). [1] https://github.com/buildroot/buildroot/blob/master/package/apache/apache.mk Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
1715173329
pushed a commit
that referenced
this pull request
Jan 21, 2022
apxs is used to get information about the apache installation when building external modules. Currently there are issues: 1. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET apache2 apxs:Error: ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/bin/apr-1-config not found!. This error is fixed by sed script #2. 2. ./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET cannot open ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/share/apache2/build/config_vars.mk: No such file or directory at ./staging_dir/target-mips_24kc_musl/usr/bin/apxs line 213. This error is fixed by sed scipt #1. Both sed scripts taken from buildroot (see [1]). [1] https://github.com/buildroot/buildroot/blob/master/package/apache/apache.mk Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net> (cherry picked from commit 83d1cda)
1715173329
pushed a commit
that referenced
this pull request
Nov 26, 2022
This fixes a segfault because gnupg/g10/options.h struct opt
is otherwise not shared between the different compilation units,
resulting in opt.homedir being NULL when passed to make_filename.
$ gpg1 -i
gpg: signal 11 caught ... exiting
Segmentation fault
(gdb) bt
#0 0x00007f17bb2185e2 in strlen (s=s@entry=0x0) at src/string/strlen.c:17
#1 0x0000000000460ea0 in make_filename (first_part=first_part@entry=0x0) at gnupg-1.4.23/util/fileutil.c:174
#2 0x000000000040ee42 in keydb_add_resource (url=url@entry=0x46bfe3 "secring.gpg", flags=flags@entry=4, secret=secret@entry=1)
at gnupg-1.4.23/g10/keydb.c:238
#3 0x00000000004062ee in main (argc=<optimized out>, argv=<optimized out>) at gnupg-1.4.23/g10/gpg.c:3323
Signed-off-by: Tjeu Kayim <15987676+TjeuKayim@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
del "#"