Page MenuHomeFreeBSD
Differential D9048

Update www/qt5-webkit to 5.212
ClosedPublic
Actions

Authored by tcberner on Jan 5 2017, 7:28 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 4:47 AM
Unknown Object (File)
Tue, Mar 25, 2:49 AM
Unknown Object (File)
Mar 8 2025, 7:07 AM
Unknown Object (File)
Mar 6 2025, 1:50 PM
Unknown Object (File)
Mar 6 2025, 12:06 PM
Unknown Object (File)
Mar 6 2025, 10:08 AM
Unknown Object (File)
Mar 6 2025, 4:12 AM
Unknown Object (File)
Mar 5 2025, 5:28 PM
View All Files
Subscribers
None

Details

Reviewers
adridg
rakuco
mat
rezny
Group Reviewers
O5: Ports Framework(Owns No Changed Paths)
portmgr
kde
Commits
rP448361: Replace www/qt5-webkit by a maintained fork.
Summary

Qt upstram dropped webkit from their releases, and only provides "community releases" of webkit.
However, the webkit it uses is very outdated (538.1).

There are however active forks of Qt5 webkit, most prominently https://github.com/annulen/webkit .

This replaces www/qt5-webkit with that.

It is a drop in replacement, so everything should build fine against it.

Pro:

  • Stuff works better
  • Less outdated

Con:

  • Fullscreen of youtube in qupzilla for example is broken

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 10046
Build 10471: arc lint + arc unit

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
Herald edited edge metadata. · View Herald TranscriptJan 5 2017, 7:48 AM
tcberner updated this revision to Diff 23620.Jan 5 2017, 8:10 AM
tcberner edited edge metadata.

As suggested by Matthew in IRC:
Rename the port to -<forkname>, and use QT5_USE_WEBKIT_FORK in the depends line in bsd.qt.mk.

Owners edited edge metadata.Jan 5 2017, 8:10 AM
Herald edited edge metadata. · View Herald TranscriptJan 5 2017, 8:10 AM
tcberner updated this revision to Diff 23621.Jan 5 2017, 8:11 AM
tcberner edited edge metadata.

Fix pkgname

Owners edited edge metadata.Jan 5 2017, 8:11 AM
Herald edited edge metadata. · View Herald TranscriptJan 5 2017, 8:11 AM
mat added inline comments.Jan 5 2017, 9:16 AM
www/qt5-webkit-annulen/Makefile
7 ↗(On Diff #23621)

While you are free to use whatever scheme you want for your public_distfile directory, I find that creating a directory per port keeps everything tidy :-)

12 ↗(On Diff #23621)

I would also rename the directory of the distfile to match PORTNAME-PORTVERSION, so that you don't need that.

47 ↗(On Diff #23621)

What I think I would do to keep most of the informations around would be:

​PORTNAME=                webkit-annulen
​PORTVERSION=                5.602.2
DISTVERSIONSUFFIX=   -db25c2b

And drop PKGNAMESUFFIX.

Then rename the distfile directory, and the distfile to match that.

You could even automate it with a target in the Makefile, say, generate-tarball or something, see what is done in net/concourse-fly for example.

www/qt5-webkit-annulen/pkg-descr
1 ↗(On Diff #23621)

A description a bit longer would be nice :-)

tcberner updated this revision to Diff 23679.Jan 6 2017, 9:12 PM
tcberner edited edge metadata.
  • shuffle version/name stuff a bit
  • add custom fetch via make create-src-archive
  • get rid of the weird ASSERT patch, by passing -DNDEBUG (suggested by annulen).
Owners edited edge metadata.Jan 6 2017, 9:12 PM
Herald edited edge metadata. · View Herald TranscriptJan 6 2017, 9:12 PM
tcberner marked 2 inline comments as done.Jan 6 2017, 9:14 PM
tcberner added inline comments.
www/qt5-webkit-annulen/pkg-descr
1 ↗(On Diff #23621)

Now its one more line -- I'll have to think of something ^^...

tcberner updated this revision to Diff 23680.Jan 6 2017, 9:40 PM
tcberner edited edge metadata.

I accidentally dropped KDE_INSTALL_INCLUDEDIR.

  • which leads to the question... should we really install the headers to QT_INCDIR?
Owners edited edge metadata.Jan 6 2017, 9:40 PM
Herald edited edge metadata. · View Herald TranscriptJan 6 2017, 9:40 PM
tcberner updated this revision to Diff 23682.Jan 6 2017, 10:21 PM
tcberner edited edge metadata.

Add patch to fix the generated pkgconfig files.

Owners edited edge metadata.Jan 6 2017, 10:21 PM
Herald edited edge metadata. · View Herald TranscriptJan 6 2017, 10:21 PM
tcberner retitled this revision from New port www/qt5-webkit2 -- a fork of qt5 webkit with a more modern webkit code base to New port www/qt5-webkit-annulen -- a fork of qt5 webkit with a more modern webkit code base.Jan 6 2017, 11:38 PM
tcberner updated this object.
tcberner edited edge metadata.
tcberner updated this revision to Diff 23735.Jan 8 2017, 9:57 AM
tcberner updated this object.
  • Disable ld.gold if it is installed
  • Add entry to CHANGES
  • Add it to www/Makefile
Owners edited edge metadata.Jan 8 2017, 9:57 AM
Herald edited edge metadata. · View Herald TranscriptJan 8 2017, 9:57 AM
tcberner updated this revision to Diff 23739.Jan 8 2017, 12:23 PM
tcberner edited edge metadata.

Update to newer git tag.

Owners edited edge metadata.Jan 8 2017, 12:23 PM
Herald edited edge metadata. · View Herald TranscriptJan 8 2017, 12:23 PM
tcberner updated this revision to Diff 24135.Jan 17 2017, 8:06 PM
tcberner edited edge metadata.

Get rid of the ld.gold part again. It's fixed by
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216012

Owners edited edge metadata.Jan 17 2017, 8:06 PM
Herald edited edge metadata. · View Herald TranscriptJan 17 2017, 8:06 PM
sylvain_sylvaingarrigues.com added a subscriber: sylvain_sylvaingarrigues.com.Mar 8 2017, 11:33 PM
tcberner updated this revision to Diff 29930.Jun 21 2017, 9:08 PM

Don't add a new port. Replace the existing one.

Harbormaster completed remote builds in B10046: Diff 29930.Jun 21 2017, 9:08 PM
tcberner retitled this revision from New port www/qt5-webkit-annulen -- a fork of qt5 webkit with a more modern webkit code base to Update www/qt5-webkit to 5.212.Jun 21 2017, 9:11 PM
tcberner edited the summary of this revision. (Show Details)
tcberner added inline comments.
www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
19

This looks wrong...

tcberner updated this revision to Diff 29931.Jun 21 2017, 9:17 PM

Remove wrong hunk from patch.

tcberner updated this revision to Diff 29943.Jun 22 2017, 6:08 AM

Update to 5.512 alpha2.

https://github.com/annulen/webkit/releases/tag/qtwebkit-5.212.0-alpha2

Harbormaster completed remote builds in B10057: Diff 29943.Jun 22 2017, 6:08 AM
tcberner added a reviewer: rezny.Jul 12 2017, 7:11 PM
tcberner added a comment.Jul 25 2017, 6:36 AM

ping in any general direction -- should I just ask for an exp-run? I've been using the port for ages (since last fall) and lost neither relatives nor pets in the process.

sylvain_sylvaingarrigues.com added a comment.Jul 25 2017, 7:48 AM

Same here, good port!

rezny edited edge metadata.Jul 28 2017, 12:13 AM

This is looking pretty good. I had no difficulty building qt5-webkit or any of the dependents (not that it was necessary to do so, just verifying). I haven't found any issues with updated webkit in a couple weeks of use.

rakuco edited edge metadata.Aug 7 2017, 9:41 PM

With Fedora and Arch Linux having switched to this fork, I guess it's time to move in the same direction. The GitHub project has some official release tarballs. Have you tried using them and dropping the Makefile hacks?

www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake
8

Doesn't USES=pathfix work here?

tcberner updated this revision to Diff 31752.Aug 8 2017, 7:53 AM

Use pathfix (modified) and official tar.xz file -- MASTER_SITES seems a bit hacky.

Harbormaster completed remote builds in B10950: Diff 31752.Aug 8 2017, 7:53 AM
rakuco accepted this revision.Aug 8 2017, 9:00 AM

As they used to say in WebKit-land, "lgtm with nits" :-)

Mk/Uses/pathfix.mk
33 ↗(On Diff #31752)

Isn't this very specific to QtWebKit?

www/qt5-webkit/Makefile
4

I always forget the version numbering rules for ports; as long as you've checked the handbook and this format is OK I'm fine with it :-)

13

WebKit's actually a mixture of LGPL, BSD and other licenses. I'd either specify all the zillion licenses here or not set LICENSE at all.

tcberner updated this revision to Diff 31754.Aug 8 2017, 9:10 AM
tcberner edited edge metadata.

Don't specify license.

tcberner added a comment.Aug 8 2017, 9:10 AM
Mk/Uses/pathfix.mk
33 ↗(On Diff #31752)

It's specific to kf5-extra-cmake-modules GeneratePkgConfig cmake file.

The upstream version of this file has been fixed to behave properly on FreeBSD, however, the version imported into this webkti port has not.

www/qt5-webkit/Makefile
4

By magic this gets turned into qt5-webkit-5.212.0.a2 -- which should be accepted ^^

mat added inline comments.Aug 8 2017, 2:22 PM
Mk/Uses/pathfix.mk
33 ↗(On Diff #31752)

Wouldn't it be easier to import the fix from upstream to fix the thing you are talking about instead of adding one more thing here ?

www/qt5-webkit/Makefile
4

This is exactly what DISTVERSION is for. Go read 5.2.2. Versions, DISTVERSION or PORTVERSION.

tcberner updated this revision to Diff 31759.Aug 8 2017, 3:31 PM

Reinstate the EPGF patch. The upstreamed one just adds some if (OS = ) instead of directly setting the path, so this one is easier.

rakuco accepted this revision.Aug 11 2017, 11:22 AM

not sure if you're waiting for feedback; still looks good to me.

tcberner added a comment.Aug 11 2017, 2:29 PM
In D9048#248479, @rakuco wrote:

not sure if you're waiting for feedback; still looks good to me.

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=221339

Sorry, I forgot to link this :)

tcberner updated this revision to Diff 32197.Aug 18 2017, 12:09 PM
tcberner edited edge metadata.

Fix fetch (PORTVERSION derives from DISTVERISON and is modified)

Harbormaster completed remote builds in B11141: Diff 32197.Aug 18 2017, 12:09 PM
Closed by commit rP448361: Replace www/qt5-webkit by a maintained fork. (authored by tcberner). · Explain WhyAug 20 2017, 8:46 AM
This revision was automatically updated to reflect the committed changes.
sylvain_sylvaingarrigues.com removed a subscriber: sylvain_sylvaingarrigues.com.Aug 20 2017, 9:16 AM

Revision Contents
Changeset List

Diff 29930

View Options

www/qt5-webkit/Makefile

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Linesstatic const struct Algorithm_t Algorithm[] = {
{ "skein512", "Skein512", &SKEIN512_TestOutput, { "skein512", "Skein512", &SKEIN512_TestOutput,
(DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update, (DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update,
(DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd }, (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd },
{ "skein1024", "Skein1024", &SKEIN1024_TestOutput, { "skein1024", "Skein1024", &SKEIN1024_TestOutput,
(DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update, (DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update,
(DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd } (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd }
}; };
static unsigned digest;
static unsigned malformed;
static bool gnu_emu = false;
static void static void
MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len)
{ {
MD5Update(c, data, len); MD5Update(c, data, len);
} }
struct chksumrec {
char *filename;
char *chksum;
struct chksumrec *next;
};
static struct chksumrec *head = NULL;
static struct chksumrec **next = &head;
impUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

imp: Can you replace this with some #define, or at the very least do the math for why 256 is the…
seAuthorUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

There already was HEX_DIGIT_LENGTH and I do use it now.

se: > Can you replace this with some #define, or at the very least do the math for why 256 is the…
impUnsubmitted
Done
Inline Actions

USE MAXPATHLEN + 1 then.

imp: USE MAXPATHLEN + 1 then.
seAuthorUnsubmitted
Done
Inline Actions

Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.

se: Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.
#define PADDING 7 /* extra padding for "SHA512t256 (...) = ...\n" style */
#define CHKFILELINELEN (HEX_DIGEST_LENGTH + MAXPATHLEN + PADDING)
static int gnu_check(const char *checksumsfile)
{
FILE *inp;
char linebuf[CHKFILELINELEN];
int linelen;
int lineno;
impUnsubmitted
Not Done
Inline Actions

Does this work with filenames / paths with spaces in them?

imp: Does this work with filenames / paths with spaces in them?
char *filename;
char *hashstr;
struct chksumrec *rec;
const char *digestname;
int digestnamelen;
int hashstrlen;
if ((inp = fopen(checksumsfile, "r")) == NULL)
err(1, "%s", checksumsfile);
digestname = Algorithm[digest].name;
digestnamelen = strlen(digestname);
hashstrlen = strlen(*(Algorithm[digest].TestOutput[0]));
lineno = 1;
while (fgets(linebuf, sizeof(linebuf), inp) != NULL) {
linelen = strlen(linebuf) - 1;
if (linelen <= 0)
break;
if (linebuf[linelen] != '\n')
errx(1, "malformed input line %d (len=%d)", lineno, linelen);
linebuf[linelen] = '\0';
filename = linebuf + digestnamelen + 2;
hashstr = linebuf + linelen - hashstrlen;
/*
* supported formats:
* BSD: <DigestName> (<Filename>): <Digest>
* GNU: <Digest> [ *]<Filename>
*/
if (linelen >= digestnamelen + hashstrlen + 6 &&
strncmp(linebuf, digestname, digestnamelen) == 0 &&
strncmp(filename - 2, " (", 2) == 0 &&
strncmp(hashstr - 4, ") = ", 4) == 0) {
*(hashstr - 4) = '\0';
} else if (linelen >= hashstrlen + 3 &&
linebuf[hashstrlen] == ' ' &&
(linebuf[hashstrlen] == ' ' ||
linebuf[hashstrlen] == '*')) {
linebuf[hashstrlen] = '\0';
hashstr = linebuf;
filename = linebuf + hashstrlen + 2;
} else {
malformed++;
continue;
}
rec = malloc(sizeof (*rec));
if (rec == NULL)
errx(1, "malloc failed");
rec->chksum = strdup(hashstr);
rec->filename = strdup(filename);
if (rec->chksum == NULL || rec->filename == NULL)
errx(1, "malloc failed");
rec->next = NULL;
*next = rec;
next = &rec->next;
lineno++;
}
fclose(inp);
return (lineno - 1);
}
/* Main driver. /* Main driver.
Arguments (may be any combination): Arguments (may be any combination):
-sstring - digests string -sstring - digests string
-t - runs time trial -t - runs time trial
-x - runs test script -x - runs test script
filename - digests file filename - digests file
(none) - digests standard input (none) - digests standard input
*/ */
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_t rights; cap_rights_t rights;
#endif #endif
int ch, fd; int ch, fd;
char *p, *string; char *p, *string;
char buf[HEX_DIGEST_LENGTH]; char buf[HEX_DIGEST_LENGTH];
size_t len; size_t len;
unsigned digest;
char *progname; char *progname;
bool gnu_emu = false; struct chksumrec *rec;
int numrecs;
if ((progname = strrchr(argv[0], '/')) == NULL) if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0]; progname = argv[0];
else else
progname++; progname++;
/* /*
* GNU coreutils has a number of programs named *sum. These produce * GNU coreutils has a number of programs named *sum. These produce
* similar results to the BSD version, but in a different format, * similar results to the BSD version, but in a different format,
* similar to BSD's -r flag. We install links to this program with * similar to BSD's -r flag. We install links to this program with
* ending 'sum' to provide this compatibility. Check here to see if the * ending 'sum' to provide this compatibility. Check here to see if the
* name of the program ends in 'sum', set the flag and drop the 'sum' so * name of the program ends in 'sum', set the flag and drop the 'sum' so
* the digest lookup works. Also, make -t a nop when running in this mode * the digest lookup works. Also, make -t a nop when running in this mode
* since that means 'text file' there (though it's a nop in coreutils * since that means 'text file' there (though it's a nop in coreutils
* on unix-like systems). The -c flag conflicts, so it's just disabled * on unix-like systems). The -c flag conflicts, so it's just disabled
* in this mode (though in the future it might be implemented). * in this mode (though in the future it might be implemented).
*/ */
len = strlen(progname); len = strlen(progname);
if (len > 3 && strcmp(progname + len - 3, "sum") == 0) { if (len > 3 && strcmp(progname + len - 3, "sum") == 0) {
progname[len - 3] = '\0'; len -= 3;
rflag = 1; rflag = 1;
gnu_emu = true; gnu_emu = true;
} }
for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++) for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++)
if (strcasecmp(Algorithm[digest].progname, progname) == 0) if (strncasecmp(Algorithm[digest].progname, progname, len) == 0)
break; break;
if (digest == sizeof(Algorithm)/sizeof(*Algorithm)) if (digest == sizeof(Algorithm)/sizeof(*Algorithm))
digest = 0; digest = 0;
failed = 0; failed = 0;
checkAgainst = NULL; checkAgainst = NULL;
checksFailed = 0; checksFailed = 0;
skip = 0; skip = 0;
while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1) while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1)
switch (ch) { switch (ch) {
case 'b': case 'b':
break; break;
case 'c': case 'c':
if (gnu_emu) if (gnu_emu)
errx(1, "-c check option not supported"); numrecs = gnu_check(optarg);
else
checkAgainst = optarg; checkAgainst = optarg;
break; break;
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
case 'r': case 'r':
Show All 19 Lines#endif
argc -= optind; argc -= optind;
argv += optind; argv += optind;
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0) if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0)
err(1, "unable to limit rights for stdio"); err(1, "unable to limit rights for stdio");
#endif #endif
if (gnu_emu) {
argc = 0;
argv = (char**)calloc(sizeof(char *), numrecs + 1);
for (rec = head; rec != NULL; rec = rec->next) {
argv[argc] = rec->filename;
argc++;
}
rec = head;
}
if (*argv) { if (*argv) {
do { do {
if ((fd = open(*argv, O_RDONLY)) < 0) { if ((fd = open(*argv, O_RDONLY)) < 0) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
continue; continue;
} }
/* /*
* XXX Enter capability mode on the last argv file. * XXX Enter capability mode on the last argv file.
* When a casper file service or other approach is * When a casper file service or other approach is
* available, switch to that and enter capability mode * available, switch to that and enter capability mode
* earlier. * earlier.
*/ */
if (*(argv + 1) == NULL) { if (*(argv + 1) == NULL) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_init(&rights, CAP_READ); cap_rights_init(&rights, CAP_READ);
if (caph_rights_limit(fd, &rights) < 0 || if (caph_rights_limit(fd, &rights) < 0 ||
caph_enter() < 0) caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
} }
if (gnu_emu) {
checkAgainst = rec->chksum;
rec = rec->next;
}
p = Algorithm[digest].Fd(fd, buf); p = Algorithm[digest].Fd(fd, buf);
(void)close(fd); (void)close(fd);
MDOutput(&Algorithm[digest], p, argv); MDOutput(&Algorithm[digest], p, argv);
} while (*++argv); } while (*++argv);
} else if (!sflag && !skip) { } else if (!sflag && !skip) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdin() < 0 || caph_enter() < 0) if (caph_limit_stdin() < 0 || caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
p = MDFilter(&Algorithm[digest], (char *)&buf, pflag); p = MDFilter(&Algorithm[digest], (char *)&buf, pflag);
MDOutput(&Algorithm[digest], p, NULL); MDOutput(&Algorithm[digest], p, NULL);
} else if (sflag) { } else if (sflag) {
len = strlen(string); len = strlen(string);
p = Algorithm[digest].Data(string, len, buf); p = Algorithm[digest].Data(string, len, buf);
MDOutput(&Algorithm[digest], p, &string); MDOutput(&Algorithm[digest], p, &string);
} }
if (gnu_emu) {
if (malformed > 0)
warnx("WARNING: %d lines are improperly formatted", malformed);
if (checksFailed > 0)
warnx("WARNING: %d computed checksum did NOT match", checksFailed);
}
if (failed != 0) if (failed != 0)
return (1); return (1);
if (checksFailed != 0) if (checksFailed != 0)
return (2); return (2);
return (0); return (0);
} }
/* /*
* Common output handling * Common output handling
*/ */
static void static void
MDOutput(const Algorithm_t *alg, char *p, char *argv[]) MDOutput(const Algorithm_t *alg, char *p, char *argv[])
{ {
bool checkfailed = false;
if (p == NULL) { if (p == NULL) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
} else { } else {
/* /*
* If argv is NULL we are reading from stdin, where the output * If argv is NULL we are reading from stdin, where the output
* format has always been just the hash. * format has always been just the hash.
*/ */
if (qflag || argv == NULL) if (qflag || argv == NULL) {
printf("%s", p); printf("%s", p);
else if (rflag) } else if (gnu_emu) {
checkfailed = strcasecmp(checkAgainst, p) != 0;
printf("%s: %s", *argv, checkfailed ? "FAILED" : "OK");
} else {
if (rflag)
printf("%s %s", p, *argv); printf("%s %s", p, *argv);
else else
printf("%s (%s) = %s", printf("%s (%s) = %s", alg->name, *argv, p);
alg->name, *argv, p); if (checkAgainst) {
if (checkAgainst && strcasecmp(checkAgainst, p) != 0) checkfailed = strcasecmp(checkAgainst, p) != 0;
{ if (!qflag && checkfailed)
checksFailed++;
if (!qflag)
printf(" [ Failed ]"); printf(" [ Failed ]");
} }
}
printf("\n"); printf("\n");
} }
if (checkfailed)
checksFailed++;
} }
/* /*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks. * Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
*/ */
static void static void
MDTimeTrial(const Algorithm_t *alg) MDTimeTrial(const Algorithm_t *alg)
{ {
▲ Show 20 Lines • Show All 210 Lines • ▼ Show 20 LinesMDFilter(const Algorithm_t *alg, char *buf, int tee)
return (p); return (p);
} }
static void static void
usage(const Algorithm_t *alg) usage(const Algorithm_t *alg)
{ {
if (gnu_emu)
fprintf(stderr, "usage: %ssum [-pqrtx] [-c file] [-s string] [files ...]\n", alg->progname);
else
fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname); fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname);
exit(1); exit(1);
} }
View Options

www/qt5-webkit/distinfo

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Linesstatic const struct Algorithm_t Algorithm[] = {
{ "skein512", "Skein512", &SKEIN512_TestOutput, { "skein512", "Skein512", &SKEIN512_TestOutput,
(DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update, (DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update,
(DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd }, (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd },
{ "skein1024", "Skein1024", &SKEIN1024_TestOutput, { "skein1024", "Skein1024", &SKEIN1024_TestOutput,
(DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update, (DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update,
(DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd } (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd }
}; };
static unsigned digest;
static unsigned malformed;
static bool gnu_emu = false;
static void static void
MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len)
{ {
MD5Update(c, data, len); MD5Update(c, data, len);
} }
struct chksumrec {
char *filename;
char *chksum;
struct chksumrec *next;
};
static struct chksumrec *head = NULL;
static struct chksumrec **next = &head;
impUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

imp: Can you replace this with some #define, or at the very least do the math for why 256 is the…
seAuthorUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

There already was HEX_DIGIT_LENGTH and I do use it now.

se: > Can you replace this with some #define, or at the very least do the math for why 256 is the…
impUnsubmitted
Done
Inline Actions

USE MAXPATHLEN + 1 then.

imp: USE MAXPATHLEN + 1 then.
seAuthorUnsubmitted
Done
Inline Actions

Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.

se: Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.
#define PADDING 7 /* extra padding for "SHA512t256 (...) = ...\n" style */
#define CHKFILELINELEN (HEX_DIGEST_LENGTH + MAXPATHLEN + PADDING)
static int gnu_check(const char *checksumsfile)
{
FILE *inp;
char linebuf[CHKFILELINELEN];
int linelen;
int lineno;
impUnsubmitted
Not Done
Inline Actions

Does this work with filenames / paths with spaces in them?

imp: Does this work with filenames / paths with spaces in them?
char *filename;
char *hashstr;
struct chksumrec *rec;
const char *digestname;
int digestnamelen;
int hashstrlen;
if ((inp = fopen(checksumsfile, "r")) == NULL)
err(1, "%s", checksumsfile);
digestname = Algorithm[digest].name;
digestnamelen = strlen(digestname);
hashstrlen = strlen(*(Algorithm[digest].TestOutput[0]));
lineno = 1;
while (fgets(linebuf, sizeof(linebuf), inp) != NULL) {
linelen = strlen(linebuf) - 1;
if (linelen <= 0)
break;
if (linebuf[linelen] != '\n')
errx(1, "malformed input line %d (len=%d)", lineno, linelen);
linebuf[linelen] = '\0';
filename = linebuf + digestnamelen + 2;
hashstr = linebuf + linelen - hashstrlen;
/*
* supported formats:
* BSD: <DigestName> (<Filename>): <Digest>
* GNU: <Digest> [ *]<Filename>
*/
if (linelen >= digestnamelen + hashstrlen + 6 &&
strncmp(linebuf, digestname, digestnamelen) == 0 &&
strncmp(filename - 2, " (", 2) == 0 &&
strncmp(hashstr - 4, ") = ", 4) == 0) {
*(hashstr - 4) = '\0';
} else if (linelen >= hashstrlen + 3 &&
linebuf[hashstrlen] == ' ' &&
(linebuf[hashstrlen] == ' ' ||
linebuf[hashstrlen] == '*')) {
linebuf[hashstrlen] = '\0';
hashstr = linebuf;
filename = linebuf + hashstrlen + 2;
} else {
malformed++;
continue;
}
rec = malloc(sizeof (*rec));
if (rec == NULL)
errx(1, "malloc failed");
rec->chksum = strdup(hashstr);
rec->filename = strdup(filename);
if (rec->chksum == NULL || rec->filename == NULL)
errx(1, "malloc failed");
rec->next = NULL;
*next = rec;
next = &rec->next;
lineno++;
}
fclose(inp);
return (lineno - 1);
}
/* Main driver. /* Main driver.
Arguments (may be any combination): Arguments (may be any combination):
-sstring - digests string -sstring - digests string
-t - runs time trial -t - runs time trial
-x - runs test script -x - runs test script
filename - digests file filename - digests file
(none) - digests standard input (none) - digests standard input
*/ */
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_t rights; cap_rights_t rights;
#endif #endif
int ch, fd; int ch, fd;
char *p, *string; char *p, *string;
char buf[HEX_DIGEST_LENGTH]; char buf[HEX_DIGEST_LENGTH];
size_t len; size_t len;
unsigned digest;
char *progname; char *progname;
bool gnu_emu = false; struct chksumrec *rec;
int numrecs;
if ((progname = strrchr(argv[0], '/')) == NULL) if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0]; progname = argv[0];
else else
progname++; progname++;
/* /*
* GNU coreutils has a number of programs named *sum. These produce * GNU coreutils has a number of programs named *sum. These produce
* similar results to the BSD version, but in a different format, * similar results to the BSD version, but in a different format,
* similar to BSD's -r flag. We install links to this program with * similar to BSD's -r flag. We install links to this program with
* ending 'sum' to provide this compatibility. Check here to see if the * ending 'sum' to provide this compatibility. Check here to see if the
* name of the program ends in 'sum', set the flag and drop the 'sum' so * name of the program ends in 'sum', set the flag and drop the 'sum' so
* the digest lookup works. Also, make -t a nop when running in this mode * the digest lookup works. Also, make -t a nop when running in this mode
* since that means 'text file' there (though it's a nop in coreutils * since that means 'text file' there (though it's a nop in coreutils
* on unix-like systems). The -c flag conflicts, so it's just disabled * on unix-like systems). The -c flag conflicts, so it's just disabled
* in this mode (though in the future it might be implemented). * in this mode (though in the future it might be implemented).
*/ */
len = strlen(progname); len = strlen(progname);
if (len > 3 && strcmp(progname + len - 3, "sum") == 0) { if (len > 3 && strcmp(progname + len - 3, "sum") == 0) {
progname[len - 3] = '\0'; len -= 3;
rflag = 1; rflag = 1;
gnu_emu = true; gnu_emu = true;
} }
for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++) for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++)
if (strcasecmp(Algorithm[digest].progname, progname) == 0) if (strncasecmp(Algorithm[digest].progname, progname, len) == 0)
break; break;
if (digest == sizeof(Algorithm)/sizeof(*Algorithm)) if (digest == sizeof(Algorithm)/sizeof(*Algorithm))
digest = 0; digest = 0;
failed = 0; failed = 0;
checkAgainst = NULL; checkAgainst = NULL;
checksFailed = 0; checksFailed = 0;
skip = 0; skip = 0;
while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1) while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1)
switch (ch) { switch (ch) {
case 'b': case 'b':
break; break;
case 'c': case 'c':
if (gnu_emu) if (gnu_emu)
errx(1, "-c check option not supported"); numrecs = gnu_check(optarg);
else
checkAgainst = optarg; checkAgainst = optarg;
break; break;
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
case 'r': case 'r':
Show All 19 Lines#endif
argc -= optind; argc -= optind;
argv += optind; argv += optind;
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0) if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0)
err(1, "unable to limit rights for stdio"); err(1, "unable to limit rights for stdio");
#endif #endif
if (gnu_emu) {
argc = 0;
argv = (char**)calloc(sizeof(char *), numrecs + 1);
for (rec = head; rec != NULL; rec = rec->next) {
argv[argc] = rec->filename;
argc++;
}
rec = head;
}
if (*argv) { if (*argv) {
do { do {
if ((fd = open(*argv, O_RDONLY)) < 0) { if ((fd = open(*argv, O_RDONLY)) < 0) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
continue; continue;
} }
/* /*
* XXX Enter capability mode on the last argv file. * XXX Enter capability mode on the last argv file.
* When a casper file service or other approach is * When a casper file service or other approach is
* available, switch to that and enter capability mode * available, switch to that and enter capability mode
* earlier. * earlier.
*/ */
if (*(argv + 1) == NULL) { if (*(argv + 1) == NULL) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_init(&rights, CAP_READ); cap_rights_init(&rights, CAP_READ);
if (caph_rights_limit(fd, &rights) < 0 || if (caph_rights_limit(fd, &rights) < 0 ||
caph_enter() < 0) caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
} }
if (gnu_emu) {
checkAgainst = rec->chksum;
rec = rec->next;
}
p = Algorithm[digest].Fd(fd, buf); p = Algorithm[digest].Fd(fd, buf);
(void)close(fd); (void)close(fd);
MDOutput(&Algorithm[digest], p, argv); MDOutput(&Algorithm[digest], p, argv);
} while (*++argv); } while (*++argv);
} else if (!sflag && !skip) { } else if (!sflag && !skip) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdin() < 0 || caph_enter() < 0) if (caph_limit_stdin() < 0 || caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
p = MDFilter(&Algorithm[digest], (char *)&buf, pflag); p = MDFilter(&Algorithm[digest], (char *)&buf, pflag);
MDOutput(&Algorithm[digest], p, NULL); MDOutput(&Algorithm[digest], p, NULL);
} else if (sflag) { } else if (sflag) {
len = strlen(string); len = strlen(string);
p = Algorithm[digest].Data(string, len, buf); p = Algorithm[digest].Data(string, len, buf);
MDOutput(&Algorithm[digest], p, &string); MDOutput(&Algorithm[digest], p, &string);
} }
if (gnu_emu) {
if (malformed > 0)
warnx("WARNING: %d lines are improperly formatted", malformed);
if (checksFailed > 0)
warnx("WARNING: %d computed checksum did NOT match", checksFailed);
}
if (failed != 0) if (failed != 0)
return (1); return (1);
if (checksFailed != 0) if (checksFailed != 0)
return (2); return (2);
return (0); return (0);
} }
/* /*
* Common output handling * Common output handling
*/ */
static void static void
MDOutput(const Algorithm_t *alg, char *p, char *argv[]) MDOutput(const Algorithm_t *alg, char *p, char *argv[])
{ {
bool checkfailed = false;
if (p == NULL) { if (p == NULL) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
} else { } else {
/* /*
* If argv is NULL we are reading from stdin, where the output * If argv is NULL we are reading from stdin, where the output
* format has always been just the hash. * format has always been just the hash.
*/ */
if (qflag || argv == NULL) if (qflag || argv == NULL) {
printf("%s", p); printf("%s", p);
else if (rflag) } else if (gnu_emu) {
checkfailed = strcasecmp(checkAgainst, p) != 0;
printf("%s: %s", *argv, checkfailed ? "FAILED" : "OK");
} else {
if (rflag)
printf("%s %s", p, *argv); printf("%s %s", p, *argv);
else else
printf("%s (%s) = %s", printf("%s (%s) = %s", alg->name, *argv, p);
alg->name, *argv, p); if (checkAgainst) {
if (checkAgainst && strcasecmp(checkAgainst, p) != 0) checkfailed = strcasecmp(checkAgainst, p) != 0;
{ if (!qflag && checkfailed)
checksFailed++;
if (!qflag)
printf(" [ Failed ]"); printf(" [ Failed ]");
} }
}
printf("\n"); printf("\n");
} }
if (checkfailed)
checksFailed++;
} }
/* /*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks. * Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
*/ */
static void static void
MDTimeTrial(const Algorithm_t *alg) MDTimeTrial(const Algorithm_t *alg)
{ {
▲ Show 20 Lines • Show All 210 Lines • ▼ Show 20 LinesMDFilter(const Algorithm_t *alg, char *buf, int tee)
return (p); return (p);
} }
static void static void
usage(const Algorithm_t *alg) usage(const Algorithm_t *alg)
{ {
if (gnu_emu)
fprintf(stderr, "usage: %ssum [-pqrtx] [-c file] [-s string] [files ...]\n", alg->progname);
else
fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname); fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname);
exit(1); exit(1);
} }
View Options

www/qt5-webkit/files/patch-Source_JavaScriptCore_assembler_ARMAssembler.h

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Linesstatic const struct Algorithm_t Algorithm[] = {
{ "skein512", "Skein512", &SKEIN512_TestOutput, { "skein512", "Skein512", &SKEIN512_TestOutput,
(DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update, (DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update,
(DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd }, (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd },
{ "skein1024", "Skein1024", &SKEIN1024_TestOutput, { "skein1024", "Skein1024", &SKEIN1024_TestOutput,
(DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update, (DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update,
(DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd } (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd }
}; };
static unsigned digest;
static unsigned malformed;
static bool gnu_emu = false;
static void static void
MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len)
{ {
MD5Update(c, data, len); MD5Update(c, data, len);
} }
struct chksumrec {
char *filename;
char *chksum;
struct chksumrec *next;
};
static struct chksumrec *head = NULL;
static struct chksumrec **next = &head;
impUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

imp: Can you replace this with some #define, or at the very least do the math for why 256 is the…
seAuthorUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

There already was HEX_DIGIT_LENGTH and I do use it now.

se: > Can you replace this with some #define, or at the very least do the math for why 256 is the…
impUnsubmitted
Done
Inline Actions

USE MAXPATHLEN + 1 then.

imp: USE MAXPATHLEN + 1 then.
seAuthorUnsubmitted
Done
Inline Actions

Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.

se: Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.
#define PADDING 7 /* extra padding for "SHA512t256 (...) = ...\n" style */
#define CHKFILELINELEN (HEX_DIGEST_LENGTH + MAXPATHLEN + PADDING)
static int gnu_check(const char *checksumsfile)
{
FILE *inp;
char linebuf[CHKFILELINELEN];
int linelen;
int lineno;
impUnsubmitted
Not Done
Inline Actions

Does this work with filenames / paths with spaces in them?

imp: Does this work with filenames / paths with spaces in them?
char *filename;
char *hashstr;
struct chksumrec *rec;
const char *digestname;
int digestnamelen;
int hashstrlen;
if ((inp = fopen(checksumsfile, "r")) == NULL)
err(1, "%s", checksumsfile);
digestname = Algorithm[digest].name;
digestnamelen = strlen(digestname);
hashstrlen = strlen(*(Algorithm[digest].TestOutput[0]));
lineno = 1;
while (fgets(linebuf, sizeof(linebuf), inp) != NULL) {
linelen = strlen(linebuf) - 1;
if (linelen <= 0)
break;
if (linebuf[linelen] != '\n')
errx(1, "malformed input line %d (len=%d)", lineno, linelen);
linebuf[linelen] = '\0';
filename = linebuf + digestnamelen + 2;
hashstr = linebuf + linelen - hashstrlen;
/*
* supported formats:
* BSD: <DigestName> (<Filename>): <Digest>
* GNU: <Digest> [ *]<Filename>
*/
if (linelen >= digestnamelen + hashstrlen + 6 &&
strncmp(linebuf, digestname, digestnamelen) == 0 &&
strncmp(filename - 2, " (", 2) == 0 &&
strncmp(hashstr - 4, ") = ", 4) == 0) {
*(hashstr - 4) = '\0';
} else if (linelen >= hashstrlen + 3 &&
linebuf[hashstrlen] == ' ' &&
(linebuf[hashstrlen] == ' ' ||
linebuf[hashstrlen] == '*')) {
linebuf[hashstrlen] = '\0';
hashstr = linebuf;
filename = linebuf + hashstrlen + 2;
} else {
malformed++;
continue;
}
rec = malloc(sizeof (*rec));
if (rec == NULL)
errx(1, "malloc failed");
rec->chksum = strdup(hashstr);
rec->filename = strdup(filename);
if (rec->chksum == NULL || rec->filename == NULL)
errx(1, "malloc failed");
rec->next = NULL;
*next = rec;
next = &rec->next;
lineno++;
}
fclose(inp);
return (lineno - 1);
}
/* Main driver. /* Main driver.
Arguments (may be any combination): Arguments (may be any combination):
-sstring - digests string -sstring - digests string
-t - runs time trial -t - runs time trial
-x - runs test script -x - runs test script
filename - digests file filename - digests file
(none) - digests standard input (none) - digests standard input
*/ */
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_t rights; cap_rights_t rights;
#endif #endif
int ch, fd; int ch, fd;
char *p, *string; char *p, *string;
char buf[HEX_DIGEST_LENGTH]; char buf[HEX_DIGEST_LENGTH];
size_t len; size_t len;
unsigned digest;
char *progname; char *progname;
bool gnu_emu = false; struct chksumrec *rec;
int numrecs;
if ((progname = strrchr(argv[0], '/')) == NULL) if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0]; progname = argv[0];
else else
progname++; progname++;
/* /*
* GNU coreutils has a number of programs named *sum. These produce * GNU coreutils has a number of programs named *sum. These produce
* similar results to the BSD version, but in a different format, * similar results to the BSD version, but in a different format,
* similar to BSD's -r flag. We install links to this program with * similar to BSD's -r flag. We install links to this program with
* ending 'sum' to provide this compatibility. Check here to see if the * ending 'sum' to provide this compatibility. Check here to see if the
* name of the program ends in 'sum', set the flag and drop the 'sum' so * name of the program ends in 'sum', set the flag and drop the 'sum' so
* the digest lookup works. Also, make -t a nop when running in this mode * the digest lookup works. Also, make -t a nop when running in this mode
* since that means 'text file' there (though it's a nop in coreutils * since that means 'text file' there (though it's a nop in coreutils
* on unix-like systems). The -c flag conflicts, so it's just disabled * on unix-like systems). The -c flag conflicts, so it's just disabled
* in this mode (though in the future it might be implemented). * in this mode (though in the future it might be implemented).
*/ */
len = strlen(progname); len = strlen(progname);
if (len > 3 && strcmp(progname + len - 3, "sum") == 0) { if (len > 3 && strcmp(progname + len - 3, "sum") == 0) {
progname[len - 3] = '\0'; len -= 3;
rflag = 1; rflag = 1;
gnu_emu = true; gnu_emu = true;
} }
for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++) for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++)
if (strcasecmp(Algorithm[digest].progname, progname) == 0) if (strncasecmp(Algorithm[digest].progname, progname, len) == 0)
break; break;
if (digest == sizeof(Algorithm)/sizeof(*Algorithm)) if (digest == sizeof(Algorithm)/sizeof(*Algorithm))
digest = 0; digest = 0;
failed = 0; failed = 0;
checkAgainst = NULL; checkAgainst = NULL;
checksFailed = 0; checksFailed = 0;
skip = 0; skip = 0;
while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1) while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1)
switch (ch) { switch (ch) {
case 'b': case 'b':
break; break;
case 'c': case 'c':
if (gnu_emu) if (gnu_emu)
errx(1, "-c check option not supported"); numrecs = gnu_check(optarg);
else
checkAgainst = optarg; checkAgainst = optarg;
break; break;
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
case 'r': case 'r':
Show All 19 Lines#endif
argc -= optind; argc -= optind;
argv += optind; argv += optind;
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0) if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0)
err(1, "unable to limit rights for stdio"); err(1, "unable to limit rights for stdio");
#endif #endif
if (gnu_emu) {
argc = 0;
argv = (char**)calloc(sizeof(char *), numrecs + 1);
for (rec = head; rec != NULL; rec = rec->next) {
argv[argc] = rec->filename;
argc++;
}
rec = head;
}
if (*argv) { if (*argv) {
do { do {
if ((fd = open(*argv, O_RDONLY)) < 0) { if ((fd = open(*argv, O_RDONLY)) < 0) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
continue; continue;
} }
/* /*
* XXX Enter capability mode on the last argv file. * XXX Enter capability mode on the last argv file.
* When a casper file service or other approach is * When a casper file service or other approach is
* available, switch to that and enter capability mode * available, switch to that and enter capability mode
* earlier. * earlier.
*/ */
if (*(argv + 1) == NULL) { if (*(argv + 1) == NULL) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_init(&rights, CAP_READ); cap_rights_init(&rights, CAP_READ);
if (caph_rights_limit(fd, &rights) < 0 || if (caph_rights_limit(fd, &rights) < 0 ||
caph_enter() < 0) caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
} }
if (gnu_emu) {
checkAgainst = rec->chksum;
rec = rec->next;
}
p = Algorithm[digest].Fd(fd, buf); p = Algorithm[digest].Fd(fd, buf);
(void)close(fd); (void)close(fd);
MDOutput(&Algorithm[digest], p, argv); MDOutput(&Algorithm[digest], p, argv);
} while (*++argv); } while (*++argv);
} else if (!sflag && !skip) { } else if (!sflag && !skip) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdin() < 0 || caph_enter() < 0) if (caph_limit_stdin() < 0 || caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
p = MDFilter(&Algorithm[digest], (char *)&buf, pflag); p = MDFilter(&Algorithm[digest], (char *)&buf, pflag);
MDOutput(&Algorithm[digest], p, NULL); MDOutput(&Algorithm[digest], p, NULL);
} else if (sflag) { } else if (sflag) {
len = strlen(string); len = strlen(string);
p = Algorithm[digest].Data(string, len, buf); p = Algorithm[digest].Data(string, len, buf);
MDOutput(&Algorithm[digest], p, &string); MDOutput(&Algorithm[digest], p, &string);
} }
if (gnu_emu) {
if (malformed > 0)
warnx("WARNING: %d lines are improperly formatted", malformed);
if (checksFailed > 0)
warnx("WARNING: %d computed checksum did NOT match", checksFailed);
}
if (failed != 0) if (failed != 0)
return (1); return (1);
if (checksFailed != 0) if (checksFailed != 0)
return (2); return (2);
return (0); return (0);
} }
/* /*
* Common output handling * Common output handling
*/ */
static void static void
MDOutput(const Algorithm_t *alg, char *p, char *argv[]) MDOutput(const Algorithm_t *alg, char *p, char *argv[])
{ {
bool checkfailed = false;
if (p == NULL) { if (p == NULL) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
} else { } else {
/* /*
* If argv is NULL we are reading from stdin, where the output * If argv is NULL we are reading from stdin, where the output
* format has always been just the hash. * format has always been just the hash.
*/ */
if (qflag || argv == NULL) if (qflag || argv == NULL) {
printf("%s", p); printf("%s", p);
else if (rflag) } else if (gnu_emu) {
checkfailed = strcasecmp(checkAgainst, p) != 0;
printf("%s: %s", *argv, checkfailed ? "FAILED" : "OK");
} else {
if (rflag)
printf("%s %s", p, *argv); printf("%s %s", p, *argv);
else else
printf("%s (%s) = %s", printf("%s (%s) = %s", alg->name, *argv, p);
alg->name, *argv, p); if (checkAgainst) {
if (checkAgainst && strcasecmp(checkAgainst, p) != 0) checkfailed = strcasecmp(checkAgainst, p) != 0;
{ if (!qflag && checkfailed)
checksFailed++;
if (!qflag)
printf(" [ Failed ]"); printf(" [ Failed ]");
} }
}
printf("\n"); printf("\n");
} }
if (checkfailed)
checksFailed++;
} }
/* /*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks. * Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
*/ */
static void static void
MDTimeTrial(const Algorithm_t *alg) MDTimeTrial(const Algorithm_t *alg)
{ {
▲ Show 20 Lines • Show All 210 Lines • ▼ Show 20 LinesMDFilter(const Algorithm_t *alg, char *buf, int tee)
return (p); return (p);
} }
static void static void
usage(const Algorithm_t *alg) usage(const Algorithm_t *alg)
{ {
if (gnu_emu)
fprintf(stderr, "usage: %ssum [-pqrtx] [-c file] [-s string] [files ...]\n", alg->progname);
else
fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname); fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname);
exit(1); exit(1);
} }
View Options

www/qt5-webkit/files/patch-Source_WTF_wtf_Platform.h

Show First 20 Lines • Show All 146 Lines • ▼ Show 20 Linesstatic const struct Algorithm_t Algorithm[] = {
{ "skein512", "Skein512", &SKEIN512_TestOutput, { "skein512", "Skein512", &SKEIN512_TestOutput,
(DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update, (DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update,
(DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd }, (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd },
{ "skein1024", "Skein1024", &SKEIN1024_TestOutput, { "skein1024", "Skein1024", &SKEIN1024_TestOutput,
(DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update, (DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update,
(DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd } (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd }
}; };
static unsigned digest;
static unsigned malformed;
static bool gnu_emu = false;
static void static void
MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len)
{ {
MD5Update(c, data, len); MD5Update(c, data, len);
} }
struct chksumrec {
char *filename;
char *chksum;
struct chksumrec *next;
};
static struct chksumrec *head = NULL;
static struct chksumrec **next = &head;
impUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

imp: Can you replace this with some #define, or at the very least do the math for why 256 is the…
seAuthorUnsubmitted
Done
Inline Actions

Can you replace this with some #define, or at the very least do the math for why 256 is the right length for 1024 bit hash?

There already was HEX_DIGIT_LENGTH and I do use it now.

se: > Can you replace this with some #define, or at the very least do the math for why 256 is the…
impUnsubmitted
Done
Inline Actions

USE MAXPATHLEN + 1 then.

imp: USE MAXPATHLEN + 1 then.
seAuthorUnsubmitted
Done
Inline Actions

Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.

se: Code changed but does not use MAXPATHLEN in the definition of the longest expected input line.
#define PADDING 7 /* extra padding for "SHA512t256 (...) = ...\n" style */
#define CHKFILELINELEN (HEX_DIGEST_LENGTH + MAXPATHLEN + PADDING)
static int gnu_check(const char *checksumsfile)
{
FILE *inp;
char linebuf[CHKFILELINELEN];
int linelen;
int lineno;
impUnsubmitted
Not Done
Inline Actions

Does this work with filenames / paths with spaces in them?

imp: Does this work with filenames / paths with spaces in them?
char *filename;
char *hashstr;
struct chksumrec *rec;
const char *digestname;
int digestnamelen;
int hashstrlen;
if ((inp = fopen(checksumsfile, "r")) == NULL)
err(1, "%s", checksumsfile);
digestname = Algorithm[digest].name;
digestnamelen = strlen(digestname);
hashstrlen = strlen(*(Algorithm[digest].TestOutput[0]));
lineno = 1;
while (fgets(linebuf, sizeof(linebuf), inp) != NULL) {
linelen = strlen(linebuf) - 1;
if (linelen <= 0)
break;
if (linebuf[linelen] != '\n')
errx(1, "malformed input line %d (len=%d)", lineno, linelen);
linebuf[linelen] = '\0';
filename = linebuf + digestnamelen + 2;
hashstr = linebuf + linelen - hashstrlen;
/*
* supported formats:
* BSD: <DigestName> (<Filename>): <Digest>
* GNU: <Digest> [ *]<Filename>
*/
if (linelen >= digestnamelen + hashstrlen + 6 &&
strncmp(linebuf, digestname, digestnamelen) == 0 &&
strncmp(filename - 2, " (", 2) == 0 &&
strncmp(hashstr - 4, ") = ", 4) == 0) {
*(hashstr - 4) = '\0';
} else if (linelen >= hashstrlen + 3 &&
linebuf[hashstrlen] == ' ' &&
(linebuf[hashstrlen] == ' ' ||
linebuf[hashstrlen] == '*')) {
linebuf[hashstrlen] = '\0';
hashstr = linebuf;
filename = linebuf + hashstrlen + 2;
} else {
malformed++;
continue;
}
rec = malloc(sizeof (*rec));
if (rec == NULL)
errx(1, "malloc failed");
rec->chksum = strdup(hashstr);
rec->filename = strdup(filename);
if (rec->chksum == NULL || rec->filename == NULL)
errx(1, "malloc failed");
rec->next = NULL;
*next = rec;
next = &rec->next;
lineno++;
}
fclose(inp);
return (lineno - 1);
}
/* Main driver. /* Main driver.
Arguments (may be any combination): Arguments (may be any combination):
-sstring - digests string -sstring - digests string
-t - runs time trial -t - runs time trial
-x - runs test script -x - runs test script
filename - digests file filename - digests file
(none) - digests standard input (none) - digests standard input
*/ */
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_t rights; cap_rights_t rights;
#endif #endif
int ch, fd; int ch, fd;
char *p, *string; char *p, *string;
char buf[HEX_DIGEST_LENGTH]; char buf[HEX_DIGEST_LENGTH];
size_t len; size_t len;
unsigned digest;
char *progname; char *progname;
bool gnu_emu = false; struct chksumrec *rec;
int numrecs;
if ((progname = strrchr(argv[0], '/')) == NULL) if ((progname = strrchr(argv[0], '/')) == NULL)
progname = argv[0]; progname = argv[0];
else else
progname++; progname++;
/* /*
* GNU coreutils has a number of programs named *sum. These produce * GNU coreutils has a number of programs named *sum. These produce
* similar results to the BSD version, but in a different format, * similar results to the BSD version, but in a different format,
* similar to BSD's -r flag. We install links to this program with * similar to BSD's -r flag. We install links to this program with
* ending 'sum' to provide this compatibility. Check here to see if the * ending 'sum' to provide this compatibility. Check here to see if the
* name of the program ends in 'sum', set the flag and drop the 'sum' so * name of the program ends in 'sum', set the flag and drop the 'sum' so
* the digest lookup works. Also, make -t a nop when running in this mode * the digest lookup works. Also, make -t a nop when running in this mode
* since that means 'text file' there (though it's a nop in coreutils * since that means 'text file' there (though it's a nop in coreutils
* on unix-like systems). The -c flag conflicts, so it's just disabled * on unix-like systems). The -c flag conflicts, so it's just disabled
* in this mode (though in the future it might be implemented). * in this mode (though in the future it might be implemented).
*/ */
len = strlen(progname); len = strlen(progname);
if (len > 3 && strcmp(progname + len - 3, "sum") == 0) { if (len > 3 && strcmp(progname + len - 3, "sum") == 0) {
progname[len - 3] = '\0'; len -= 3;
rflag = 1; rflag = 1;
gnu_emu = true; gnu_emu = true;
} }
for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++) for (digest = 0; digest < sizeof(Algorithm)/sizeof(*Algorithm); digest++)
if (strcasecmp(Algorithm[digest].progname, progname) == 0) if (strncasecmp(Algorithm[digest].progname, progname, len) == 0)
break; break;
if (digest == sizeof(Algorithm)/sizeof(*Algorithm)) if (digest == sizeof(Algorithm)/sizeof(*Algorithm))
digest = 0; digest = 0;
failed = 0; failed = 0;
checkAgainst = NULL; checkAgainst = NULL;
checksFailed = 0; checksFailed = 0;
skip = 0; skip = 0;
while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1) while ((ch = getopt(argc, argv, "bc:pqrs:tx")) != -1)
switch (ch) { switch (ch) {
case 'b': case 'b':
break; break;
case 'c': case 'c':
if (gnu_emu) if (gnu_emu)
errx(1, "-c check option not supported"); numrecs = gnu_check(optarg);
else
checkAgainst = optarg; checkAgainst = optarg;
break; break;
case 'p': case 'p':
pflag = 1; pflag = 1;
break; break;
case 'q': case 'q':
qflag = 1; qflag = 1;
break; break;
case 'r': case 'r':
Show All 19 Lines#endif
argc -= optind; argc -= optind;
argv += optind; argv += optind;
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0) if (caph_limit_stdout() < 0 || caph_limit_stderr() < 0)
err(1, "unable to limit rights for stdio"); err(1, "unable to limit rights for stdio");
#endif #endif
if (gnu_emu) {
argc = 0;
argv = (char**)calloc(sizeof(char *), numrecs + 1);
for (rec = head; rec != NULL; rec = rec->next) {
argv[argc] = rec->filename;
argc++;
}
rec = head;
}
if (*argv) { if (*argv) {
do { do {
if ((fd = open(*argv, O_RDONLY)) < 0) { if ((fd = open(*argv, O_RDONLY)) < 0) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
continue; continue;
} }
/* /*
* XXX Enter capability mode on the last argv file. * XXX Enter capability mode on the last argv file.
* When a casper file service or other approach is * When a casper file service or other approach is
* available, switch to that and enter capability mode * available, switch to that and enter capability mode
* earlier. * earlier.
*/ */
if (*(argv + 1) == NULL) { if (*(argv + 1) == NULL) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
cap_rights_init(&rights, CAP_READ); cap_rights_init(&rights, CAP_READ);
if (caph_rights_limit(fd, &rights) < 0 || if (caph_rights_limit(fd, &rights) < 0 ||
caph_enter() < 0) caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
} }
if (gnu_emu) {
checkAgainst = rec->chksum;
rec = rec->next;
}
p = Algorithm[digest].Fd(fd, buf); p = Algorithm[digest].Fd(fd, buf);
(void)close(fd); (void)close(fd);
MDOutput(&Algorithm[digest], p, argv); MDOutput(&Algorithm[digest], p, argv);
} while (*++argv); } while (*++argv);
} else if (!sflag && !skip) { } else if (!sflag && !skip) {
#ifdef HAVE_CAPSICUM #ifdef HAVE_CAPSICUM
if (caph_limit_stdin() < 0 || caph_enter() < 0) if (caph_limit_stdin() < 0 || caph_enter() < 0)
err(1, "capsicum"); err(1, "capsicum");
#endif #endif
p = MDFilter(&Algorithm[digest], (char *)&buf, pflag); p = MDFilter(&Algorithm[digest], (char *)&buf, pflag);
MDOutput(&Algorithm[digest], p, NULL); MDOutput(&Algorithm[digest], p, NULL);
} else if (sflag) { } else if (sflag) {
len = strlen(string); len = strlen(string);
p = Algorithm[digest].Data(string, len, buf); p = Algorithm[digest].Data(string, len, buf);
MDOutput(&Algorithm[digest], p, &string); MDOutput(&Algorithm[digest], p, &string);
} }
if (gnu_emu) {
if (malformed > 0)
warnx("WARNING: %d lines are improperly formatted", malformed);
if (checksFailed > 0)
warnx("WARNING: %d computed checksum did NOT match", checksFailed);
}
if (failed != 0) if (failed != 0)
return (1); return (1);
if (checksFailed != 0) if (checksFailed != 0)
return (2); return (2);
return (0); return (0);
} }
/* /*
* Common output handling * Common output handling
*/ */
static void static void
MDOutput(const Algorithm_t *alg, char *p, char *argv[]) MDOutput(const Algorithm_t *alg, char *p, char *argv[])
{ {
bool checkfailed = false;
if (p == NULL) { if (p == NULL) {
warn("%s", *argv); warn("%s", *argv);
failed++; failed++;
} else { } else {
/* /*
* If argv is NULL we are reading from stdin, where the output * If argv is NULL we are reading from stdin, where the output
* format has always been just the hash. * format has always been just the hash.
*/ */
if (qflag || argv == NULL) if (qflag || argv == NULL) {
printf("%s", p); printf("%s", p);
else if (rflag) } else if (gnu_emu) {
checkfailed = strcasecmp(checkAgainst, p) != 0;
printf("%s: %s", *argv, checkfailed ? "FAILED" : "OK");
} else {
if (rflag)
printf("%s %s", p, *argv); printf("%s %s", p, *argv);
else else
printf("%s (%s) = %s", printf("%s (%s) = %s", alg->name, *argv, p);
alg->name, *argv, p); if (checkAgainst) {
if (checkAgainst && strcasecmp(checkAgainst, p) != 0) checkfailed = strcasecmp(checkAgainst, p) != 0;
{ if (!qflag && checkfailed)
checksFailed++;
if (!qflag)
printf(" [ Failed ]"); printf(" [ Failed ]");
} }
}
printf("\n"); printf("\n");
} }
if (checkfailed)
checksFailed++;
} }
/* /*
* Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks. * Measures the time to digest TEST_BLOCK_COUNT TEST_BLOCK_LEN-byte blocks.
*/ */
static void static void
MDTimeTrial(const Algorithm_t *alg) MDTimeTrial(const Algorithm_t *alg)
{ {
▲ Show 20 Lines • Show All 210 Lines • ▼ Show 20 LinesMDFilter(const Algorithm_t *alg, char *buf, int tee)
return (p); return (p);
} }
static void static void
usage(const Algorithm_t *alg) usage(const Algorithm_t *alg)
{ {
if (gnu_emu)
fprintf(stderr, "usage: %ssum [-pqrtx] [-c file] [-s string] [files ...]\n", alg->progname);
else
fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname); fprintf(stderr, "usage: %s [-pqrtx] [-c string] [-s string] [files ...]\n", alg->progname);
exit(1); exit(1);
} }
View Options

www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp

Loading...
View Options

www/qt5-webkit/files/patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h

Loading...
View Options

www/qt5-webkit/files/patch-Source_WebCore_platform_leveldb_LevelDBDatabase.cpp

Loading...
View Options

www/qt5-webkit/files/patch-Source_WebKit_PlatformQt.cmake

Loading...
View Options

www/qt5-webkit/files/patch-Source__JavaScriptCore__runtime__JSCJSValueInlines.h

Loading...
View Options

www/qt5-webkit/files/patch-Source__QtWebKit.pro

Loading...
View Options

www/qt5-webkit/files/patch-Source__WebCore__page__NavigatorBase.cpp

Loading...
View Options

www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurface.h

Loading...
View Options

www/qt5-webkit/files/patch-Source__WebCore__platform__graphics__surfaces__GraphicsSurfaceToken.h

Loading...
View Options

www/qt5-webkit/files/patch-Source_cmake_ECMGeneratePkgConfigFile.cmake

Loading...
View Options

www/qt5-webkit/files/patch-Source_cmake_KDEInstallDirs.cmake

Loading...
View Options

www/qt5-webkit/files/patch-Tools_qmake_config.tests_glx_glx.pro

Loading...
View Options

www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.cpp

Loading...
View Options

www/qt5-webkit/files/patch-Tools_qmake_config.tests_leveldb_leveldb.pro

Loading...
View Options

www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXcomposite_libXcomposite.pro

Loading...
View Options

www/qt5-webkit/files/patch-Tools_qmake_config.tests_libXrender_libXrender.pro

Loading...
View Options

www/qt5-webkit/pkg-descr

Loading...
View Options

www/qt5-webkit/pkg-plist

Loading...