Jason Self <js...@gnu.org> writes: > On Tue, 03 Sep 2024 08:54:26 +0200 > Simon Josefsson via gnu-prog-discuss <gnu-prog-disc...@gnu.org> wrote: > >> I wonder if maybe some packages used the abbreviated version >> 'Franklin St' instead? > > Possibly; USPS standardized abbreviations would have Street shortened > to St. > >> Does anyone have a list of all known FSF addresses? > > 1000 Mass Ave
"1000 Mass Ave" https://sources.debian.org/src/chess.app/2.8-5/debian/copyright/?hl=135#L135 > 675 Mass Ave "675 mass ave" https://sources.debian.org/src/bbpager/0.4.7-10/src/blackboxstyle.h/?hl=18#L18 "675 Mass Ave" https://sources.debian.org/src/krb5/1.21.3-3/src/util/et/texinfo.tex/?hl=94#L94 > Note that "Mass Ave" is Massachusetts Avenue. USPS standardized > abbreviations would have it as Massachusetts Ave but some people > abbreviate both words. "675 Massachusetts Avenue" https://sources.debian.org/src/gretl/2024b-2/utils/emacs/gretl.el.top/?hl=30#L30 "675 Massachusetts Ave" https://sources.debian.org/src/casacore/3.6.1-3/lattices/LRegions/LCBox.cc/?hl=17#L17 > 59 Temple Place > Note that it may be abbreviated Temple Pl and that Suite or Ste may > be included along with the number 330. "59 Temple Place" https://codesearch.debian.net/show?file=util-linux_2.40.2-7%2Fm4%2Fpkg.m4&line=19 > 51 Franklin St > Your earlier note about Fifth Floor and Suite 500 applies or Suite > might be abbreviated Ste. Another possibility might be "Fl 5" or "5th > Floor" or "5th Fl". "franklin street" https://sources.debian.org/src/lomiri-download-manager/0.1.3-5/src/downloads/common/lomiri/download_manager/group_download_struct.cpp/?hl=15#L15 "Franklin St" https://searchcode.com/file/617132022/scripts/dtc/libfdt/fdt_rw.c/ > 31 Milk Street # 960789 > Note that according to USPS standardized abbreviations it > should be Milk St. I can't find any occurance for this one -- presumably because few maintainers used time machines for preparing license headers. I think a regexp like this should cover it all: (Mass Ave|Massachusetts Ave|Temple Pl|Franklin St|Milk St) It covers 'Temple Pl' that I couldn't find any occurances for, and 'Milk St' for future problems. I found a couple of pre-franklin addresses in some projects this way. I've pushed the attached patch to gnulib. Hopefully false positives are rare but please provide feedback and maybe we can improve the regexp. /Simon
From 086c5c1c67b379ffcdbad47460e1366a35f8b8c0 Mon Sep 17 00:00:00 2001 From: Simon Josefsson <si...@josefsson.org> Date: Tue, 3 Sep 2024 20:40:51 +0200 Subject: [PATCH] syntax-check: Catch all FSF postal addresses. * top/maint.mk (sc_franklin_street): Rename to sc_fsf_postal, improve regexp. --- ChangeLog | 6 ++++++ top/maint.mk | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31b402c0ea..a281d657a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-09-03 Simon Josefsson <si...@josefsson.org> + + syntax-check: Catch all FSF postal addresses. + * top/maint.mk (sc_franklin_street): Rename to sc_fsf_postal, + improve regexp. + 2024-09-03 Bruno Haible <br...@clisp.org> unlockpt tests: Avoid test failure on Haiku. diff --git a/top/maint.mk b/top/maint.mk index 68f027aa28..a6f130d3d6 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1047,11 +1047,11 @@ sc_GFDL_version: halt='GFDL vN, N!=3' \ $(_sc_search_regexp) -# Look out for 'Franklin Street' addresses -- use URLs instead: +# Look out for FSF postal addresses -- use URLs instead: # https://www.gnu.org/prep/maintain/html_node/License-Notices-for-Code.html -sc_franklin_street: - @prohibit='Franklin.*Street' \ - halt='use URLs instead of old Franklin Street postal address' \ +sc_fsf_postal: + @prohibit='(Mass Ave|Massachusetts Ave|Temple Pl|Franklin St|Milk St)' \ + halt='use license URLs instead of FSF postal address' \ $(_sc_search_regexp) # Don't use Texinfo's @acronym{}. -- 2.45.2
signature.asc
Description: PGP signature
