OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

57 lines
2.0 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../heimdal/roken-h-process.pl.patch
  5. # Copyright (C) 2014 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. Update roken-h-process.pl to the latest available version including upstream
  17. bugfixes.
  18. That is the diff between the shipped version within the version 1.5.3 tarball
  19. and currently latest version available:
  20. https://github.com/heimdal/heimdal/blob/97f1e2efb5754b953905ea1a41a5c469765f6267/cf/roken-h-process.pl
  21. diff --git a/cf/roken-h-process.pl b/cf/roken-h-process.pl
  22. index a54c921..e797dd2 100644
  23. --- a/cf/roken-h-process.pl
  24. +++ b/cf/roken-h-process.pl
  25. @@ -1,10 +1,10 @@
  26. #!/usr/bin/perl
  27. -require 'getopts.pl';
  28. +use Getopt::Std;
  29. my $debug = 0;
  30. -Getopts('dc:p:o:') || die "foo";
  31. +getopts('dc:p:o:') || die "foo";
  32. if ($opt_d) {
  33. $debug = 1;
  34. @@ -145,12 +145,15 @@ sub parse_if
  35. if (m/^\s*$/) {
  36. print "end $_\n" if ($debug);
  37. return 1;
  38. + } elsif (m/^\(([^&]+)\&\&(.*)\)\s*\|\|\s*\(([^&]+)\&\&(.*)\)$/) {
  39. + print "($1 and $2) or ($3 and $4)\n" if ($debug);
  40. + return ((parse_if($1) and parse_if($2)) or (parse_if($3) and parse_if($4)));
  41. } elsif (m/^([^&]+)\&\&(.*)$/) {
  42. print "$1 and $2\n" if ($debug);
  43. return parse_if($1) and parse_if($2);
  44. } elsif (m/^([^\|]+)\|\|(.*)$/) {
  45. print "$1 or $2\n" if ($debug);
  46. - return parse_if($1) or parse_if($2);
  47. + return (parse_if($1) or parse_if($2));
  48. } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) {
  49. ($neg, $var) = ($1, $2);
  50. print "def: ${neg}-defined(${var})\n" if ($debug);