Revert "[pkgconf] fix asan issue" (#29151)

* Revert "[pkgconf] fix asan issue (#29017)"

This reverts commit fe5f181633b2faee289ff433061a821ec5fb35b5.

* bump port version

* v db
This commit is contained in:
Alexander Neumann 2023-01-25 01:28:56 +01:00 committed by GitHub
parent 136ad069fd
commit c082b799d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 48 deletions

View File

@ -1,45 +0,0 @@
diff --git a/cli/getopt_long.c b/cli/getopt_long.c
index c47215fae..4dcac3d7d 100644
--- a/cli/getopt_long.c
+++ b/cli/getopt_long.c
@@ -377,27 +376,28 @@ getopt_internal(int nargc, char * const *nargv, const char *options,
if (options == NULL)
return (-1);
-
/*
* Disable GNU extensions if POSIXLY_CORRECT is set or options
* string begins with a '+'.
*/
posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
+ if(strcmp(options,"")!=0)
+ {
#ifdef GNU_COMPATIBLE
- if (*options == '-')
- flags |= FLAG_ALLARGS;
- else if (posixly_correct || *options == '+')
- flags &= ~FLAG_PERMUTE;
+ if (*options == '-')
+ flags |= FLAG_ALLARGS;
+ else if (posixly_correct || *options == '+')
+ flags &= ~FLAG_PERMUTE;
#else
- if (posixly_correct || *options == '+')
- flags &= ~FLAG_PERMUTE;
- else if (*options == '-')
- flags |= FLAG_ALLARGS;
+ if (posixly_correct || *options == '+')
+ flags &= ~FLAG_PERMUTE;
+ else if (*options == '-')
+ flags |= FLAG_ALLARGS;
#endif
- if (*options == '+' || *options == '-')
- options++;
-
+ if (*options == '+' || *options == '-')
+ options++;
+ }
/*
* XXX Some GNU programs (like cvs) set pkg_optind to 0 instead of
* XXX using pkg_optreset. Work around this braindamage.

View File

@ -4,7 +4,6 @@ vcpkg_from_github(
REF cef30268e1a3f79efd607c26abcf556aa314c9c4
SHA512 ea03b81d01521201bdc471a39cdc8b13f9452f7cc78706d5c57056595f3e4e8a3562c022ebb72ce6444f2c7a8dfc778114814ef5064eaef770a70cc294c7f7ee
HEAD_REF master
PATCHES bufferoverflow.patch
)
vcpkg_configure_meson(

View File

@ -1,7 +1,7 @@
{
"name": "pkgconf",
"version": "1.8.0",
"port-version": 4,
"port-version": 5,
"description": "pkgconf is a program which helps to configure compiler and linker flags for development libraries. It is similar to pkg-config from freedesktop.org.",
"homepage": "https://github.com/pkgconf/pkgconf",
"license": null,

View File

@ -5918,7 +5918,7 @@
},
"pkgconf": {
"baseline": "1.8.0",
"port-version": 4
"port-version": 5
},
"plasma-wayland-protocols": {
"baseline": "1.8.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8848e56b32837456dfb872f6ca3cc9953558d453",
"version": "1.8.0",
"port-version": 5
},
{
"git-tree": "1b19a4f679f330a422d353f54a9148fa3672c2c1",
"version": "1.8.0",