Description
paul
2014-10-31 20:41:58 UTC
please resubmit the patches as attachments and *PLEASE* provide patches with unified format, e.g. "diff -u", not this format which is both barely readable and bugzilla viewer can't handle it. Created attachment 148843 [details]
Unified diff for security/pam_google_authenticator/Makefile
Created attachment 148844 [details]
Unified diff for security/pam_google_authenticator/files/patch-pam_google_authenticator.c
Unified diffs are now attached. Paul Many thanks! I see as a bonus we convert an existing patch to unified format. I'm tweaking the title and notifying the maintainer that he has two weeks to respond, otherwise it's automatically approved. Created attachment 149004 [details]
(UPDATED) Unified diff for security/pam_google_authenticator/files/patch-pam_google_authenticator.c
I found a problem with my original patch for pam_google_authenticator.c. I forgot to wrap the call to get_timestamp() inside of #if defined(STEPSIZE). This is necessary since one of the versions of get_timestamp() requires arguments and the other does not.
This is an updated version of the diffs for pam_google_authenticator.c
Created attachment 149005 [details]
(UPDATE, again) Unified diff for security/pam_google_authenticator/files/patch-pam_google_authenticator.c
One more try to get the format of the diff correct. Sorry for the multiple updates.
Created attachment 149035 [details]
Unified diff for security/pam_google_authenticator/files/patch-pam_google_authenticator.c
One final change to fix a bug that I found. When STEPSIZE is enabled, but the user is using a default, 30 second TOTP token, then authentication was using a static time instead of being based on the current time.
Created attachment 149036 [details]
Unified diff for security/pam_google_authenticator/files/patch-pam_google_authenticator.c
And in the proper format this time.
I think you can replace +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSTEPSIZE} +CFLAGS+= -DSTEPSIZE +.endif with: STEPSIZE_CFLAGS= -DSTEPSIZE You might want to verify and resubmit. FYI, this PR will receive a maintainer timeout very soon. Created attachment 149563 [details]
Unified diff for security/pam_google_authenticator/Makefile
An updated version of the patch for security/pam_google_authenticator/Makefile that uses "STEPSIZE_CFLAGS" instead of ".if ${PORT_OPTIONS:MSTEPSIZE}"
Thanks, I'll promote this -- due to feedback timeout, maintainer approval no longer required. For the future, having a single diff that updates multiple files is more convenient for the submitter, thanks. A commit references this bug: Author: riggs Date: Sat Nov 22 18:30:18 UTC 2014 New revision: 373085 URL: https://svnweb.freebsd.org/changeset/ports/373085 Log: Introduce non-default OPTION for variable time steps besides the 30 seconds default PR: 194723 Submitted by: paul@dokas.name Approved by: maintainer timeout Changes: head/security/pam_google_authenticator/Makefile head/security/pam_google_authenticator/files/patch-pam_google_authenticator.c Committed, thanks! |