mirror of the now-defunct rocklinux.org
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.

154 lines
6.4 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/net-snmp/head-tail.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. diff -dur net-snmp-5.1/aclocal.m4 net-snmp-5.1-p/aclocal.m4
  20. --- net-snmp-5.1/aclocal.m4 2003-02-13 17:01:23.000000000 +0100
  21. +++ net-snmp-5.1-p/aclocal.m4 2004-11-04 19:36:53.223558384 +0100
  22. @@ -39,7 +39,7 @@
  23. dnl
  24. AC_DEFUN([AC_PROMPT_USER],
  25. [
  26. -MSG_CHECK=`echo "$2" | tail -1`
  27. +MSG_CHECK=`echo "$2" | tail -n1`
  28. AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
  29. [echo "" >&AC_FD_MSG
  30. AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
  31. @@ -3545,7 +3545,7 @@
  32. lt_cv_file_magic_cmd='/usr/bin/file -L'
  33. case "$host_os" in
  34. rhapsody* | darwin1.[[012]])
  35. - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
  36. + lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1`
  37. ;;
  38. *) # Darwin 1.3 on
  39. lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
  40. diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure
  41. --- net-snmp-5.1/configure 2003-11-14 03:56:34.000000000 +0100
  42. +++ net-snmp-5.1-p/configure 2004-11-04 19:36:41.327366880 +0100
  43. @@ -4106,7 +4106,7 @@
  44. lt_cv_file_magic_cmd='/usr/bin/file -L'
  45. case "$host_os" in
  46. rhapsody* | darwin1.[012])
  47. - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
  48. + lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1`
  49. ;;
  50. *) # Darwin 1.3 on
  51. lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
  52. @@ -25980,7 +25980,7 @@
  53. ME=`$WHOAMI`
  54. if test -f /etc/resolv.conf; then
  55. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  56. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  57. else
  58. LOC="@no.where"
  59. fi
  60. @@ -26006,7 +26006,7 @@
  61. Providing the --with-default-snmp-version=\"x\" parameter to ./configure
  62. will avoid this prompt.
  63. -Default version of SNMP to use" | tail -1`
  64. +Default version of SNMP to use" | tail -n1`
  65. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  66. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  67. if test "${ac_cv_user_prompt_DEFAULT_SNMP_VERSION+set}" = set; then
  68. @@ -26087,7 +26087,7 @@
  69. Providing the --with-sys-contact=\"contact\" parameter to ./configure
  70. will avoid this prompt.
  71. -System Contact Information" | tail -1`
  72. +System Contact Information" | tail -n1`
  73. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  74. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  75. if test "${ac_cv_user_prompt_SYS_CONTACT+set}" = set; then
  76. @@ -26151,7 +26151,7 @@
  77. Providing the --with-sys-location=\"location\" parameter to ./configure
  78. will avoid this prompt.
  79. -System Location" | tail -1`
  80. +System Location" | tail -n1`
  81. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  82. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  83. if test "${ac_cv_user_prompt_SYS_LOC+set}" = set; then
  84. @@ -26221,7 +26221,7 @@
  85. Providing the --with-logfile=\"path\" parameter to ./configure
  86. will avoid this prompt.
  87. -Location to write logfile" | tail -1`
  88. +Location to write logfile" | tail -n1`
  89. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  90. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  91. if test "${ac_cv_user_prompt_LOGFILE+set}" = set; then
  92. @@ -26298,7 +26298,7 @@
  93. Providing the --with-persistent-directory=\"path\" parameter to
  94. ./configure will avoid this prompt.
  95. -Location to write persistent information" | tail -1`
  96. +Location to write persistent information" | tail -n1`
  97. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  98. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  99. if test "${ac_cv_user_prompt_PERSISTENT_DIRECTORY+set}" = set; then
  100. diff -dur net-snmp-5.1/configure.in net-snmp-5.1-p/configure.in
  101. --- net-snmp-5.1/configure.in 2003-11-06 03:11:41.000000000 +0100
  102. +++ net-snmp-5.1-p/configure.in 2004-11-04 19:36:11.392917608 +0100
  103. @@ -2663,7 +2663,7 @@
  104. ME=`$WHOAMI`
  105. if test -f /etc/resolv.conf; then
  106. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  107. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  108. else
  109. LOC="@no.where"
  110. fi
  111. diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV
  112. --- net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV 2003-03-01 05:02:18.000000000 +0100
  113. +++ net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV 2004-11-04 19:36:03.998041800 +0100
  114. @@ -48,7 +48,7 @@
  115. umask 022
  116. -user=`ps -f | tail -1 | awk '{print $1}' | sed -e 's, ,,g'`
  117. +user=`ps -f | tail -n1 | awk '{print $1}' | sed -e 's, ,,g'`
  118. [ "$user" = "root" ] && p="#" || p="$"
  119. PS1="`basename $TOP`@"'$HOSTNAME:${PWD##$TOP}$p '; export PS1
  120. diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh
  121. --- net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh 2003-03-01 05:02:18.000000000 +0100
  122. +++ net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh 2004-11-04 19:35:22.221392816 +0100
  123. @@ -56,7 +56,7 @@
  124. done | sort -u | while read libpath other
  125. do
  126. [ "$libpath" = "#" ] && echo "$libpath $other" && continue # error message
  127. - set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -1`
  128. + set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -n1`
  129. path=$1; type=$2
  130. case $type in
  131. f) # file
  132. diff -dur net-snmp-5.1/local/snmp-ucd.sh net-snmp-5.1-p/local/snmp-ucd.sh
  133. --- net-snmp-5.1/local/snmp-ucd.sh 2002-04-20 09:30:13.000000000 +0200
  134. +++ net-snmp-5.1-p/local/snmp-ucd.sh 2004-11-04 19:35:15.864359232 +0100
  135. @@ -106,7 +106,7 @@
  136. # Try looking for a /var/run file.
  137. #
  138. [ -f /var/run/$1.pid ] && {
  139. - pid=`head -1 /var/run/$1.pid`
  140. + pid=`head -n1 /var/run/$1.pid`
  141. [ -n "$pid" ] && {
  142. echo $pid