From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../files/xastir-2.0.0-dont-filter-flags.diff | 11 ++ media-radio/xastir/files/xastir-2.0.4-fortify.diff | 144 +++++++++++++++++++++ .../files/xastir-2.0.4-no-builtin-shapelib.diff | 58 +++++++++ media-radio/xastir/files/xastir-2.0.4-scripts.diff | 101 +++++++++++++++ .../files/xastir-2.0.8-no-builtin-shapelib.diff | 58 +++++++++ media-radio/xastir/files/xastir-2.0.8-scripts.diff | 91 +++++++++++++ 6 files changed, 463 insertions(+) create mode 100644 media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff create mode 100644 media-radio/xastir/files/xastir-2.0.4-fortify.diff create mode 100644 media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff create mode 100644 media-radio/xastir/files/xastir-2.0.4-scripts.diff create mode 100644 media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff create mode 100644 media-radio/xastir/files/xastir-2.0.8-scripts.diff (limited to 'media-radio/xastir/files') diff --git a/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff new file mode 100644 index 000000000000..1fbea1d61a57 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.0-dont-filter-flags.diff @@ -0,0 +1,11 @@ +# Do not filter duplicate CFLAGS (bug 411095) +--- configure.ac.orig 2012-12-07 15:12:43.000000000 +0100 ++++ configure.ac 2012-12-07 15:13:08.000000000 +0100 +@@ -709,7 +709,6 @@ + # "-llibrary" that needs it. + # + changequote(,) +-CFLAGS=`echo "$CFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'` + CPPFLAGS=`echo "$CPPFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'` + LDFLAGS=`echo "$LDFLAGS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'` + #LIBS=`echo "$LIBS" | awk '{for(i=1;i<=NF;++i) {if (arg[$i]++ == 0) s = s " " $i} print s}'` diff --git a/media-radio/xastir/files/xastir-2.0.4-fortify.diff b/media-radio/xastir/files/xastir-2.0.4-fortify.diff new file mode 100644 index 000000000000..e2c34b007475 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.4-fortify.diff @@ -0,0 +1,144 @@ +--- src/rac_data.c.orig 2012-09-23 18:19:22.000000000 +0200 ++++ src/rac_data.c 2012-11-29 21:00:53.000000000 +0100 +@@ -212,7 +212,8 @@ + char char_offset[16]; + char index[32]; + int found = 0; +- rac_record racdata; ++ char buffer[sizeof(rac_record)]; ++ rac_record *racdata = (rac_record *)buffer; + /*char filler[8];*/ + char amacall_path[MAX_VALUE]; + +@@ -220,7 +221,7 @@ + + + xastir_snprintf(index, sizeof(index)," "); +- xastir_snprintf(racdata.callsign, sizeof(racdata.callsign)," "); ++ xastir_snprintf(racdata->callsign, sizeof(racdata->callsign)," "); + + /* ==================================================================== */ + /* Search thru the index, get the RBA */ +@@ -257,19 +258,19 @@ + if (callsign[5] == '-') + (void)chomp(callsign,5); + +- while (!feof(fdb) && strncmp((char *)&racdata, callsign, 6) < 0) ++ while (!feof(fdb) && strncmp(buffer, callsign, 6) < 0) + + //WE7U + // Problem here: We're sticking 8 bytes too many into racdata! +- rc = fgets((char *)&racdata, sizeof(racdata), fdb); ++ rc = fgets(buffer, sizeof(buffer), fdb); + + } else + fprintf(stderr,"Search:Could not open RAC data base: %s\n", get_data_base_dir("fcc/AMACALL.LST") ); + + /* || (callsign[5] == '-' && strncmp((char *)&racdata,callsign,5) < 0)) */ +- (void)chomp(racdata.callsign, 6); ++ (void)chomp(racdata->callsign, 6); + +- if (!strncmp((char *)racdata.callsign, callsign, 6)) { ++ if (!strncmp(racdata->callsign, callsign, 6)) { + found = 1; + + // Some of these cause problems on 64-bit processors, so commented +@@ -293,82 +294,82 @@ + xastir_snprintf(data->callsign, + sizeof(data->callsign), + "%s", +- racdata.callsign); ++ racdata->callsign); + + xastir_snprintf(data->first_name, + sizeof(data->first_name), + "%s", +- racdata.first_name); ++ racdata->first_name); + + xastir_snprintf(data->last_name, + sizeof(data->last_name), + "%s", +- racdata.last_name); ++ racdata->last_name); + + xastir_snprintf(data->address, + sizeof(data->address), + "%s", +- racdata.address); ++ racdata->address); + + xastir_snprintf(data->city, + sizeof(data->city), + "%s", +- racdata.city); ++ racdata->city); + + xastir_snprintf(data->province, + sizeof(data->province), + "%s", +- racdata.province); ++ racdata->province); + + xastir_snprintf(data->postal_code, + sizeof(data->postal_code), + "%s", +- racdata.postal_code); ++ racdata->postal_code); + + xastir_snprintf(data->qual_a, + sizeof(data->qual_a), + "%s", +- racdata.qual_a); ++ racdata->qual_a); + + xastir_snprintf(data->qual_b, + sizeof(data->qual_b), + "%s", +- racdata.qual_b); ++ racdata->qual_b); + + xastir_snprintf(data->qual_c, + sizeof(data->qual_c), + "%s", +- racdata.qual_c); ++ racdata->qual_c); + + xastir_snprintf(data->qual_d, + sizeof(data->qual_d), + "%s", +- racdata.qual_d); ++ racdata->qual_d); + + xastir_snprintf(data->club_name, + sizeof(data->club_name), + "%s", +- racdata.club_name); ++ racdata->club_name); + + xastir_snprintf(data->club_address, + sizeof(data->club_address), + "%s", +- racdata.club_address); ++ racdata->club_address); + + xastir_snprintf(data->club_city, + sizeof(data->club_city), + "%s", +- racdata.club_city); ++ racdata->club_city); + + xastir_snprintf(data->club_province, + sizeof(data->club_province), + "%s", +- racdata.club_province); ++ racdata->club_province); + + xastir_snprintf(data->club_postal_code, + sizeof(data->club_postal_code), + "%s", +- racdata.club_postal_code); ++ racdata->club_postal_code); + + } + (void)fclose(fdb); diff --git a/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff new file mode 100644 index 000000000000..7aef072a5c39 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.4-no-builtin-shapelib.diff @@ -0,0 +1,58 @@ +--- configure.ac.orig 2012-11-30 08:29:51.000000000 +0100 ++++ configure.ac 2012-11-30 08:29:56.000000000 +0100 +@@ -368,27 +368,17 @@ + + # Check for Shapelib + use_shapelib=yes +-force_internal_shapelib=no + shapelib_desired=yes + LIBSHP="" + SUBSHP="" + # This symbol will be blank if the proj library hasn't been found, and will + # have the three programs that need proj if it has + CONTSHP="" +-AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) + AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) + if test "${shapelib_desired}" = "no"; then + use_shapelib=no +- force_internal_shapelib=no + fi +-if test "${force_internal_shapelib}" = "yes"; then +- AC_MSG_WARN([***************************************************************** ]) +- AC_MSG_WARN([Internal Shapelib library has been forced. ]) +- AC_MSG_WARN([***************************************************************** ]) +- # Temporary setting to get into if block below +- use_shapelib=no +-fi +-if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then ++if test "${shapelib_desired}" = "yes" ; then + use_shapelib=no + AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes + LIBS="$LIBS -lshp" +@@ -397,26 +387,6 @@ + AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) + break)]) + fi +-if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then +- AC_MSG_WARN([**************************************************************** ]) +- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ]) +- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ]) +- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ]) +- AC_MSG_WARN([**************************************************************** ]) +- LIBSHP="-Lshapelib -lshape" +- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS" +- SUBSHP="shapelib" +- use_shapelib=yes +- force_internal_shapelib=yes +- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) +- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) +- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) +- +- if test $use_proj = "yes" +- then +- CONTSHP="shpcentrd shpproj shpdata shpwkb" +- fi +-fi + AC_SUBST(SUBSHP) + AC_SUBST(CONTSHP) + AC_SUBST(LIBSHP) diff --git a/media-radio/xastir/files/xastir-2.0.4-scripts.diff b/media-radio/xastir/files/xastir-2.0.4-scripts.diff new file mode 100644 index 000000000000..369295b07f8c --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.4-scripts.diff @@ -0,0 +1,101 @@ +# patch scripts location (bug #407185). partially backported from upstream. +--- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:23.000000000 +0100 ++++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.000000000 +0100 +@@ -12,9 +12,7 @@ + get-fcc-rac.pl \ + get-gnis \ + get-pop \ +- get-maptools.sh \ + get-NWSdata \ +- get_shapelib.sh \ + gpx2shape \ + icontable.pl \ + inf2geo.pl \ +@@ -43,10 +41,8 @@ + values \ + values.pl \ + waypoint-get.pl \ +- xastir-fixcfg.sh \ +- xastir-migrate.sh \ + Xastir_tigerpoly.py + + install-data-hook: + cd $(DESTDIR)$(scriptsdir) && \ +- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash ++ chmod a+x *.pl *.py get-* gpx2* *.bash +diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl +--- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000 +@@ -26,7 +26,7 @@ + # + + +-use lib "${prefix}/lib"; ++use lib /usr/share/xastir/scripts; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl +--- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -34,7 +34,7 @@ + # + + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl +--- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -33,7 +33,7 @@ + + #------------------------------------------------------------------------------------------------ + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # Snag WE7U's Coordinate module + + +diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl +--- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000 +@@ -28,14 +28,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama250k.pl" ++# - "/usr/share/xastir/scripts/toporama250k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ +diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl +--- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000 +@@ -27,14 +27,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama50k.pl" ++# - "/usr/share/xastir/scripts/toporama50k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ diff --git a/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff new file mode 100644 index 000000000000..8cbdbc2cdb62 --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-no-builtin-shapelib.diff @@ -0,0 +1,58 @@ +--- configure.ac.orig 2016-07-12 07:08:17.988160777 +0200 ++++ configure.ac 2016-07-12 07:11:42.591138389 +0200 +@@ -382,27 +382,17 @@ + + # Check for Shapelib + use_shapelib=yes +-force_internal_shapelib=no + shapelib_desired=yes + LIBSHP="" + SUBSHP="" + # This symbol will be blank if the proj library hasn't been found, and will + # have the three programs that need proj if it has + CONTSHP="" +-AC_ARG_WITH(internal-shapelib,[ --with-internal-shapelib Force use of internal shapelib library.],force_internal_shapelib=$withval) + AC_ARG_WITH(shapelib,[ --without-shapelib Disable shapelib features.],shapelib_desired=$withval) + if test "${shapelib_desired}" = "no"; then + use_shapelib=no +- force_internal_shapelib=no + fi +-if test "${force_internal_shapelib}" = "yes"; then +- AC_MSG_WARN([***************************************************************** ]) +- AC_MSG_WARN([Internal Shapelib library has been forced. ]) +- AC_MSG_WARN([***************************************************************** ]) +- # Temporary setting to get into if block below +- use_shapelib=no +-fi +-if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then ++if test "${shapelib_desired}" = "yes" ; then + use_shapelib=no + AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes + LIBS="$LIBS -lshp" +@@ -411,26 +401,6 @@ + AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) + break)]) + fi +-if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then +- AC_MSG_WARN([**************************************************************** ]) +- AC_MSG_WARN([Your system does not have shapelib installed. Using an internal ]) +- AC_MSG_WARN([version. This may lead to a larger filesize for the executable. ]) +- AC_MSG_WARN([Install shapelib on your system to eliminate this warning. ]) +- AC_MSG_WARN([**************************************************************** ]) +- LIBSHP="-Lshapelib -lshape" +- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS" +- SUBSHP="shapelib" +- use_shapelib=yes +- force_internal_shapelib=yes +- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) +- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). ) +- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. ) +- +- if test $use_proj = "yes" +- then +- CONTSHP="shpcentrd$(EXEEXT) shpproj$(EXEEXT) shpdata$(EXEEXT) shpwkb$(EXEEXT)" +- fi +-fi + AC_SUBST(SUBSHP) + AC_SUBST(CONTSHP) + AC_SUBST(LIBSHP) diff --git a/media-radio/xastir/files/xastir-2.0.8-scripts.diff b/media-radio/xastir/files/xastir-2.0.8-scripts.diff new file mode 100644 index 000000000000..35c73246c9ee --- /dev/null +++ b/media-radio/xastir/files/xastir-2.0.8-scripts.diff @@ -0,0 +1,91 @@ +# patch scripts location (bug #407185). partially backported from upstream. +--- xastir-2.0.0-orig/scripts/Makefile.am.orig 2012-11-27 05:41:23.000000000 +0100 ++++ xastir-2.0.0/scripts/Makefile.am 2012-12-05 06:21:59.000000000 +0100 +@@ -43,10 +41,8 @@ + values \ + values.pl \ + waypoint-get.pl \ +- xastir-fixcfg.sh \ +- xastir-migrate.sh \ + Xastir_tigerpoly.py + + install-data-hook: + cd $(DESTDIR)$(scriptsdir) && \ +- chmod a+x *.sh *.pl *.py get-* gpx2* *.bash ++ chmod a+x *.pl *.py get-* gpx2* *.bash +diff -Nur -u xastir-2.0.0.orig/scripts/coord-convert.pl xastir-2.0.0/scripts/coord-convert.pl +--- xastir-2.0.0.orig/scripts/coord-convert.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/coord-convert.pl 2012-03-07 15:46:01.000000000 +0000 +@@ -26,7 +26,7 @@ + # + + +-use lib "${prefix}/lib"; ++use lib /usr/share/xastir/scripts; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/permutations.pl xastir-2.0.0/scripts/permutations.pl +--- xastir-2.0.0.orig/scripts/permutations.pl 2010-07-03 22:09:48.000000000 +0000 ++++ xastir-2.0.0/scripts/permutations.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -34,7 +34,7 @@ + # + + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # WE7U's Coordinate.pm module + + +diff -Nur -u xastir-2.0.0.orig/scripts/test_coord.pl xastir-2.0.0/scripts/test_coord.pl +--- xastir-2.0.0.orig/scripts/test_coord.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/test_coord.pl 2012-03-07 15:42:34.000000000 +0000 +@@ -33,7 +33,7 @@ + + #------------------------------------------------------------------------------------------------ + +-use lib "/usr/local/lib"; ++use lib "/usr/share/xastir/scripts"; + use Coordinate; # Snag WE7U's Coordinate module + + +diff -Nur -u xastir-2.0.0.orig/scripts/toporama250k.pl xastir-2.0.0/scripts/toporama250k.pl +--- xastir-2.0.0.orig/scripts/toporama250k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama250k.pl 2012-03-07 15:46:49.000000000 +0000 +@@ -28,14 +28,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama250k.pl" ++# - "/usr/share/xastir/scripts/toporama250k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ +diff -Nur -u xastir-2.0.0.orig/scripts/toporama50k.pl xastir-2.0.0/scripts/toporama50k.pl +--- xastir-2.0.0.orig/scripts/toporama50k.pl 2010-01-31 02:12:23.000000000 +0000 ++++ xastir-2.0.0/scripts/toporama50k.pl 2012-03-07 15:47:01.000000000 +0000 +@@ -27,14 +27,14 @@ + # map files for the whole of Canada! + # + # +-# - "cd /usr/local/share/xastir/maps" ++# - "cd /usr/share/xastir/maps" + # + # - Assure you have write privileges in the directory above either + # by becoming root using the "su" command, using "sudo", or + # temporarily changing ownership and/or privileges on the + # "maps" directory. + # +-# - "/usr/local/lib/xastir/toporama50k.pl" ++# - "/usr/share/xastir/scripts/toporama50k.pl" + # + # - The script will create/populate this directory heirarchy: + # .../maps/toporama/images/ -- cgit v1.2.3