Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 9b574762fd10148e4e8cba9fbe5121dbb9ad4914
  foo-overlay: 36c88de95cb1aa0be7ceb4c1210f724a00147ceb
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: ca99e58b5f8f675db880346a44039de6bd5446e3
  mythtv: 232ca207c520eb294db060a770aafd30ffa25afb
  • Loading branch information...
commit 8316711670062fd661ecfd1e723a0bc5f9812cc2 1 parent 6c4ea07
Daniel Robbins danielrobbins authored
Showing with 2,604 additions and 3,415 deletions.
  1. +2 −2 app-admin/logrotate/logrotate-3.8.3.ebuild
  2. +1 −0  app-admin/mcollective/Manifest
  3. +3 −3 app-admin/mcollective/files/mcollectived.initd
  4. +60 −0 app-admin/mcollective/mcollective-2.2.0.ebuild
  5. +1 −0  app-admin/sysstat/Manifest
  6. +92 −0 app-admin/sysstat/sysstat-10.1.3.ebuild
  7. +0 −73 app-crypt/mit-krb5/files/2011-006-patch-r18.patch
  8. +0 −33 app-crypt/mit-krb5/files/CVE-2010-1322.patch
  9. +0 −202 app-crypt/mit-krb5/files/CVE-2010-1323.1324.4020.patch
  10. +0 −19 app-crypt/mit-krb5/files/CVE-2010-4022.patch
  11. +0 −126 app-crypt/mit-krb5/files/CVE-2011-0281.0282.0283.patch
  12. +0 −13 app-crypt/mit-krb5/files/CVE-2011-0284.patch
  13. +0 −39 app-crypt/mit-krb5/files/CVE-2011-0285.patch
  14. +0 −40 app-crypt/mit-krb5/files/CVE-2011-1530.patch
  15. +0 −13 app-crypt/mit-krb5/files/mit-krb5-1.10_uninitialized.patch
  16. +10 −0 app-crypt/mit-krb5/files/mit-krb5-1.11_uninitialized.patch
  17. +0 −112 app-crypt/mit-krb5/files/mit-krb5-1.8.3-CVE-2011-0281.0282.0283.patch
  18. +0 −35 app-crypt/mit-krb5/files/mit-krb5-1.8.3-CVE-2011-0285.patch
  19. +0 −25 app-crypt/mit-krb5/files/mit-krb5-kprop_exit_on_error.patch
  20. +0 −93 app-crypt/mit-krb5/files/mit-krb5_testsuite.patch
  21. +2 −1  app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
  22. +1 −4 app-crypt/tpm-emulator/{tpm-emulator-0.7.4.ebuild → tpm-emulator-0.7.4-r1.ebuild}
  23. +1 −0  app-emulation/ganeti/Manifest
  24. +42 −0 app-emulation/ganeti/files/ganeti-2.6-fix-tests.patch
  25. +137 −0 app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
  26. +160 −0 app-emulation/ganeti/ganeti-2.6.2.ebuild
  27. +1 −0  app-emulation/hercules/Manifest
  28. +39 −0 app-emulation/hercules/hercules-3.08.ebuild
  29. +1 −1  app-misc/tasque/Manifest
  30. +0 −244 app-misc/tasque/files/tasque-0.1.9-cachetasks.patch
  31. +53 −0 app-misc/tasque/tasque-0.1.12.ebuild
  32. +0 −66 app-misc/tasque/tasque-0.1.9.ebuild
  33. +1 −2  app-misc/tomboy/Manifest
  34. +3 −4 app-misc/tomboy/{tomboy-1.12.1.ebuild → tomboy-1.12.2.ebuild}
  35. +0 −53 app-misc/tomboy/tomboy-1.8.3.ebuild
  36. +7 −2 app-misc/uptimed/files/uptimed.init
  37. +1 −1  app-misc/uptimed/{uptimed-0.3.16-r5.ebuild → uptimed-0.3.16-r6.ebuild}
  38. +1 −1  app-misc/uptimed/{uptimed-0.3.17.ebuild → uptimed-0.3.17-r1.ebuild}
  39. +0 −1  dev-cpp/glibmm/Manifest
  40. +0 −71 dev-cpp/glibmm/glibmm-2.30.1.ebuild
  41. +3 −4 dev-cpp/glibmm/glibmm-2.34.1.ebuild
  42. +1 −1  dev-cpp/glibmm/metadata.xml
  43. +0 −1  dev-cpp/gtkmm/Manifest
  44. +0 −62 dev-cpp/gtkmm/gtkmm-3.2.0.ebuild
  45. +7 −5 dev-cpp/gtkmm/gtkmm-3.6.0.ebuild
  46. +0 −1  dev-haskell/haskell-src/Manifest
  47. +0 −20 dev-haskell/haskell-src/haskell-src-1.0.1.3.ebuild
  48. +29 −0 dev-haskell/haskell-src/haskell-src-1.0.1.5-r1.ebuild
  49. +1 −1  dev-haskell/hdbc-mysql/Manifest
  50. +7 −7 dev-haskell/hdbc-mysql/{hdbc-mysql-0.6.6.0.ebuild → hdbc-mysql-0.6.6.1-r1.ebuild}
  51. +1 −1  dev-haskell/hdbc-odbc/Manifest
  52. +20 −14 dev-haskell/hdbc-odbc/{hdbc-odbc-2.2.3.2.ebuild → hdbc-odbc-2.3.1.1.ebuild}
  53. +0 −1  dev-haskell/hdbc-postgresql/Manifest
  54. +53 −0 dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch
  55. +0 −61 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.2.3.3.ebuild
  56. +4 −2 dev-haskell/hdbc-postgresql/hdbc-postgresql-2.3.2.1.ebuild
  57. +52 −0 dev-haskell/hdbc-sqlite/files/HDBC-sqlite3-2.3.3.0-ghc-7.6.patch
  58. +2 −1  dev-haskell/hdbc-sqlite/hdbc-sqlite-2.3.3.0.ebuild
  59. +1 −2  dev-haskell/hdbc/Manifest
  60. +0 −37 dev-haskell/hdbc/files/hdbc-2.2.7.0-fix-fbuildtests.patch
  61. +0 −64 dev-haskell/hdbc/hdbc-2.2.7.0.ebuild
  62. +9 −9 dev-haskell/hdbc/{hdbc-2.3.1.1.ebuild → hdbc-2.3.1.2.ebuild}
  63. +28 −0 dev-haskell/statevar/statevar-1.0.0.0-r1.ebuild
  64. +6 −1 dev-haskell/zlib/zlib-0.5.3.3.ebuild
  65. +2 −0  dev-lang/opendylan-bin/Manifest
  66. +33 −0 dev-lang/opendylan-bin/opendylan-bin-2012.1.ebuild
  67. +1 −2  dev-libs/gmime/Manifest
  68. +0 −49 dev-libs/gmime/files/gmime-2.6.4-fix-tutorial.patch
  69. +12 −19 dev-libs/gmime/{gmime-2.6.11.ebuild → gmime-2.6.13.ebuild}
  70. +0 −60 dev-libs/gmime/gmime-2.6.7.ebuild
  71. +1 −1  dev-libs/jthread/metadata.xml
  72. +2 −4 dev-libs/libgee/Manifest
  73. +0 −29 dev-libs/libgee/libgee-0.6.6.ebuild
  74. +9 −11 dev-libs/libgee/{libgee-0.6.5.ebuild → libgee-0.6.7.ebuild}
  75. +0 −38 dev-libs/libgee/libgee-0.8.1.ebuild
  76. +9 −16 dev-libs/libgee/{libgee-0.8.0.ebuild → libgee-0.8.3.ebuild}
  77. +0 −4 dev-libs/libgee/metadata.xml
  78. +25 −0 dev-perl/Email-Send-Gmail/Email-Send-Gmail-0.330.0.ebuild
  79. +1 −0  dev-perl/Email-Send-Gmail/Manifest
  80. +15 −0 dev-perl/Email-Send-Gmail/metadata.xml
  81. +1 −0  dev-ruby/maruku/Manifest
  82. +49 −0 dev-ruby/maruku/maruku-0.6.1.ebuild
  83. +1 −0  dev-ruby/method_source/Manifest
  84. +28 −0 dev-ruby/method_source/method_source-0.8.1.ebuild
  85. +1 −2  dev-ruby/minitest/Manifest
  86. +0 −43 dev-ruby/minitest/minitest-2.6.2.ebuild
  87. +18 −8 dev-ruby/minitest/{minitest-3.3.0.ebuild → minitest-4.3.3.ebuild}
  88. +1 −0  dev-ruby/mocha/Manifest
  89. +38 −0 dev-ruby/mocha/mocha-0.13.1.ebuild
  90. +2 −2 games-board/gnugo/Manifest
  91. +2 −2 games-board/gnugo/gnugo-3.9.1.ebuild
  92. +1 −1  games-strategy/majesty-demo/Manifest
  93. +10 −9 games-strategy/majesty-demo/majesty-demo-1.0.0.ebuild
  94. +1 −0  gnome-base/gnome-applets/Manifest
  95. +116 −0 gnome-base/gnome-applets/gnome-applets-3.6.0-r1.ebuild
  96. +1 −1  gnome-base/gnome-applets/metadata.xml
  97. +1 −1  gnome-base/gnome-panel/Manifest
  98. +22 −43 gnome-base/gnome-panel/{gnome-panel-3.2.1.ebuild → gnome-panel-3.6.2.ebuild}
  99. +1 −3 gnome-base/gnome-panel/metadata.xml
  100. +1 −0  gnome-base/nautilus/Manifest
  101. +44 −0 gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
  102. +109 −0 gnome-base/nautilus/nautilus-3.6.3.ebuild
  103. +3 −4 gnome-extra/gcalctool/Manifest
  104. +0 −36 gnome-extra/gcalctool/gcalctool-6.2.0.ebuild
  105. +11 −13 gnome-extra/gcalctool/{gcalctool-6.4.1.1.ebuild → gcalctool-6.6.2.ebuild}
  106. +1 −2  gnome-extra/gnome-color-manager/Manifest
  107. +0 −79 gnome-extra/gnome-color-manager/gnome-color-manager-3.2.3.ebuild
  108. +20 −26 gnome-extra/gnome-color-manager/{gnome-color-manager-3.2.4.ebuild → gnome-color-manager-3.6.0.ebuild}
  109. +2 −1  gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild
  110. +4 −5 gnome-extra/gnome-system-monitor/Manifest
  111. +0 −39 gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2.ebuild
  112. +0 −39 gnome-extra/gnome-system-monitor/gnome-system-monitor-3.2.1.ebuild
  113. +13 −13 gnome-extra/gnome-system-monitor/{gnome-system-monitor-3.4.0.ebuild → gnome-system-monitor-3.6.1.ebuild}
  114. +1 −1  gnome-extra/nautilus-sendto/Manifest
  115. +16 −20 gnome-extra/nautilus-sendto/{nautilus-sendto-3.0.2.ebuild → nautilus-sendto-3.6.0.ebuild}
  116. +2 −1  gnome-extra/seahorse-nautilus/Manifest
  117. +52 −0 gnome-extra/seahorse-nautilus/seahorse-nautilus-3.6.1.ebuild
  118. +1 −1  gnome-extra/sushi/Manifest
  119. +5 −1 gnome-extra/sushi/metadata.xml
  120. +2 −2 gnome-extra/sushi/sushi-0.4.1.ebuild
  121. +20 −14 gnome-extra/sushi/{sushi-0.2.1.ebuild → sushi-3.6.1.ebuild}
  122. +2 −2 kde-base/ffmpegthumbs/ffmpegthumbs-4.9.4.ebuild
  123. +2 −2 kde-base/kajongg/kajongg-4.9.4.ebuild
  124. +2 −2 kde-base/kdeadmin-meta/kdeadmin-meta-4.9.4.ebuild
  125. +2 −2 kde-base/kdeartwork-meta/kdeartwork-meta-4.9.4.ebuild
  126. +2 −2 kde-base/kdeedu-meta/kdeedu-meta-4.9.4.ebuild
  127. +2 −2 kde-base/kdegames-meta/kdegames-meta-4.9.4.ebuild
  128. +2 −2 kde-base/kdegraphics-meta/kdegraphics-meta-4.9.4.ebuild
  129. +2 −2 kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9.4.ebuild
  130. +2 −2 kde-base/kdenetwork-meta/kdenetwork-meta-4.9.4.ebuild
  131. +2 −2 kde-base/kdepim-meta/kdepim-meta-4.9.4.ebuild
  132. +2 −2 kde-base/kdetoys-meta/kdetoys-meta-4.9.4.ebuild
  133. +2 −2 kde-base/kdeutils-meta/kdeutils-meta-4.9.4.ebuild
  134. +2 −2 kde-base/kigo/kigo-4.9.4.ebuild
  135. +6 −1 media-libs/xine-lib/xine-lib-1.2.1-r1.ebuild
  136. +6 −1 media-libs/xine-lib/xine-lib-1.2.2.ebuild
  137. +6 −1 media-libs/xine-lib/xine-lib-1.2.9999.ebuild
  138. +1 −1  media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
  139. +1 −0  media-video/totem/Manifest
  140. +6 −8 media-video/totem/metadata.xml
  141. +141 −0 media-video/totem/totem-3.6.3-r1.ebuild
  142. +1 −1  metadata/dtd/timestamp.chk
  143. +1 −1  metadata/glsa/timestamp.chk
  144. +2 −2 metadata/md5-cache/app-admin/logrotate-3.8.3
  145. +14 −0 metadata/md5-cache/app-admin/mcollective-2.2.0
  146. +13 −0 metadata/md5-cache/app-admin/sysstat-10.1.3
  147. +1 −1  metadata/md5-cache/app-crypt/{tpm-emulator-0.7.4 → tpm-emulator-0.7.4-r1}
  148. +14 −0 metadata/md5-cache/app-emulation/ganeti-2.5.2-r2
  149. +14 −0 metadata/md5-cache/app-emulation/ganeti-2.6.2
  150. +13 −0 metadata/md5-cache/app-emulation/hercules-3.08
  151. +14 −0 metadata/md5-cache/app-misc/tasque-0.1.12
  152. +0 −13 metadata/md5-cache/app-misc/tasque-0.1.9
  153. +5 −5 metadata/md5-cache/app-misc/{tomboy-1.12.1 → tomboy-1.12.2}
  154. +0 −13 metadata/md5-cache/app-misc/tomboy-1.8.3
  155. +1 −1  metadata/md5-cache/app-misc/{uptimed-0.3.16-r5 → uptimed-0.3.16-r6}
  156. +1 −1  metadata/md5-cache/app-misc/{uptimed-0.3.17 → uptimed-0.3.17-r1}
  157. +0 −13 metadata/md5-cache/dev-cpp/glibmm-2.30.1
  158. +2 −2 metadata/md5-cache/dev-cpp/glibmm-2.34.1
  159. +0 −13 metadata/md5-cache/dev-cpp/gtkmm-3.2.0
  160. +3 −3 metadata/md5-cache/dev-cpp/gtkmm-3.6.0
  161. +0 −12 metadata/md5-cache/dev-haskell/haskell-src-1.0.1.3
  162. +13 −0 metadata/md5-cache/dev-haskell/haskell-src-1.0.1.5-r1
  163. +0 −14 metadata/md5-cache/dev-haskell/hdbc-2.2.7.0
  164. +6 −6 metadata/md5-cache/dev-haskell/{hdbc-2.3.1.1 → hdbc-2.3.1.2}
  165. +6 −6 metadata/md5-cache/dev-haskell/{hdbc-mysql-0.6.6.0 → hdbc-mysql-0.6.6.1-r1}
  166. +0 −14 metadata/md5-cache/dev-haskell/hdbc-odbc-2.2.3.2
  167. +14 −0 metadata/md5-cache/dev-haskell/hdbc-odbc-2.3.1.1
  168. +0 −14 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.2.3.3
  169. +3 −3 metadata/md5-cache/dev-haskell/hdbc-postgresql-2.3.2.1
  170. +1 −1  metadata/md5-cache/dev-haskell/hdbc-sqlite-2.3.3.0
  171. +13 −0 metadata/md5-cache/dev-haskell/statevar-1.0.0.0-r1
  172. +2 −2 metadata/md5-cache/dev-haskell/zlib-0.5.3.3
  173. +11 −0 metadata/md5-cache/dev-lang/opendylan-bin-2012.1
  174. +7 −7 metadata/md5-cache/dev-libs/{gmime-2.6.11 → gmime-2.6.13}
  175. +0 −13 metadata/md5-cache/dev-libs/gmime-2.6.7
  176. +0 −13 metadata/md5-cache/dev-libs/libgee-0.6.6
  177. +7 −7 metadata/md5-cache/dev-libs/{libgee-0.6.5 → libgee-0.6.7}
  178. +0 −13 metadata/md5-cache/dev-libs/libgee-0.8.1
  179. +7 −7 metadata/md5-cache/dev-libs/{libgee-0.8.0 → libgee-0.8.3}
  180. +13 −0 metadata/md5-cache/dev-perl/Email-Send-Gmail-0.330.0
  181. +14 −0 metadata/md5-cache/dev-ruby/maruku-0.6.1
  182. +14 −0 metadata/md5-cache/dev-ruby/method_source-0.8.1
  183. +0 −13 metadata/md5-cache/dev-ruby/minitest-2.6.2
  184. +0 −14 metadata/md5-cache/dev-ruby/minitest-3.3.0
  185. +14 −0 metadata/md5-cache/dev-ruby/minitest-4.3.3
  186. +14 −0 metadata/md5-cache/dev-ruby/mocha-0.13.1
  187. +2 −2 metadata/md5-cache/games-board/gnugo-3.9.1
  188. +3 −2 metadata/md5-cache/games-strategy/majesty-demo-1.0.0
  189. +14 −0 metadata/md5-cache/gnome-base/gnome-applets-3.6.0-r1
  190. +0 −13 metadata/md5-cache/gnome-base/gnome-panel-3.2.1
  191. +13 −0 metadata/md5-cache/gnome-base/gnome-panel-3.6.2
  192. +15 −0 metadata/md5-cache/gnome-base/nautilus-3.6.3
  193. +0 −12 metadata/md5-cache/gnome-extra/gcalctool-6.2.0
  194. +6 −6 metadata/md5-cache/gnome-extra/{gcalctool-6.4.1.1 → gcalctool-6.6.2}
  195. +0 −14 metadata/md5-cache/gnome-extra/gnome-color-manager-3.2.3
  196. +0 −14 metadata/md5-cache/gnome-extra/gnome-color-manager-3.2.4
  197. +14 −0 metadata/md5-cache/gnome-extra/gnome-color-manager-3.6.0
  198. +1 −1  metadata/md5-cache/gnome-extra/gnome-screensaver-3.6.1
  199. +0 −12 metadata/md5-cache/gnome-extra/gnome-system-monitor-2.28.2
  200. +0 −12 metadata/md5-cache/gnome-extra/gnome-system-monitor-3.2.1
  201. +5 −5 metadata/md5-cache/gnome-extra/{gnome-system-monitor-3.4.0 → gnome-system-monitor-3.6.1}
  202. +0 −13 metadata/md5-cache/gnome-extra/nautilus-sendto-3.0.2
  203. +13 −0 metadata/md5-cache/gnome-extra/nautilus-sendto-3.6.0
  204. +12 −0 metadata/md5-cache/gnome-extra/seahorse-nautilus-3.6.1
  205. +0 −12 metadata/md5-cache/gnome-extra/sushi-0.2.1
  206. +2 −2 metadata/md5-cache/gnome-extra/sushi-0.4.1
  207. +13 −0 metadata/md5-cache/gnome-extra/sushi-3.6.1
  208. +2 −2 metadata/md5-cache/kde-base/ffmpegthumbs-4.9.4
  209. +2 −2 metadata/md5-cache/kde-base/kajongg-4.9.4
  210. +2 −2 metadata/md5-cache/kde-base/kdeadmin-meta-4.9.4
  211. +2 −2 metadata/md5-cache/kde-base/kdeartwork-meta-4.9.4
  212. +2 −2 metadata/md5-cache/kde-base/kdeedu-meta-4.9.4
  213. +2 −2 metadata/md5-cache/kde-base/kdegames-meta-4.9.4
  214. +2 −2 metadata/md5-cache/kde-base/kdegraphics-meta-4.9.4
  215. +2 −2 metadata/md5-cache/kde-base/kdemultimedia-meta-4.9.4
  216. +2 −2 metadata/md5-cache/kde-base/kdenetwork-meta-4.9.4
  217. +2 −2 metadata/md5-cache/kde-base/kdepim-meta-4.9.4
  218. +2 −2 metadata/md5-cache/kde-base/kdetoys-meta-4.9.4
  219. +2 −2 metadata/md5-cache/kde-base/kdeutils-meta-4.9.4
  220. +2 −2 metadata/md5-cache/kde-base/kigo-4.9.4
  221. +2 −2 metadata/md5-cache/media-libs/xine-lib-1.2.1-r1
  222. +2 −2 metadata/md5-cache/media-libs/xine-lib-1.2.2
  223. +2 −2 metadata/md5-cache/media-libs/xine-lib-1.2.9999
  224. +14 −0 metadata/md5-cache/media-video/totem-3.6.3-r1
  225. +6 −6 metadata/md5-cache/net-dialup/{moserial-3.0.6 → moserial-3.0.8}
  226. +13 −0 metadata/md5-cache/net-libs/rest-0.7.90
  227. +3 −3 metadata/md5-cache/net-misc/httptype-1.3.9
  228. +10 −0 metadata/md5-cache/net-misc/httptype-1.3.9-r1
  229. +0 −13 metadata/md5-cache/net-misc/sparkleshare-0.8.4
  230. +12 −0 metadata/md5-cache/net-misc/sparkleshare-1.0.0
  231. +0 −11 metadata/md5-cache/net-misc/ups-monitor-0.8.3-r1
  232. +2 −2 metadata/md5-cache/net-proxy/squid-3.1.22
  233. +0 −14 metadata/md5-cache/net-wireless/gnome-bluetooth-3.2.2
  234. +13 −0 metadata/md5-cache/net-wireless/gnome-bluetooth-3.6.1
  235. +13 −0 metadata/md5-cache/sci-mathematics/genius-1.0.16
  236. +0 −13 metadata/md5-cache/sys-apps/gnome-disk-utility-2.32.1
  237. +0 −13 metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r200
  238. +0 −13 metadata/md5-cache/sys-apps/gnome-disk-utility-3.0.2-r300
  239. +7 −7 metadata/md5-cache/sys-apps/{gnome-disk-utility-3.4.0 → gnome-disk-utility-3.6.1}
  240. +13 −0 metadata/md5-cache/sys-apps/shadow-4.1.5.1-r1
  241. +13 −0 metadata/md5-cache/sys-boot/unetbootin-583
  242. +2 −2 metadata/md5-cache/sys-cluster/vzctl-3.3-r4
  243. +2 −2 metadata/md5-cache/sys-process/cronutils-1.2
  244. +2 −2 metadata/md5-cache/www-apps/dokuwiki-20120125a
  245. +13 −0 metadata/md5-cache/www-apps/dokuwiki-20121013
  246. +13 −0 metadata/md5-cache/x11-libs/goffice-0.10.0
  247. +0 −13 metadata/md5-cache/x11-libs/goffice-0.8.17
  248. +2 −2 metadata/md5-cache/x11-libs/qt-bearer-4.8.4
  249. +2 −2 metadata/md5-cache/x11-libs/qt-core-4.8.4
  250. +2 −2 metadata/md5-cache/x11-libs/qt-dbus-4.8.4
  251. +2 −2 metadata/md5-cache/x11-libs/qt-gui-4.8.4
  252. +2 −2 metadata/md5-cache/x11-libs/qt-opengl-4.8.4
  253. +2 −2 metadata/md5-cache/x11-libs/qt-phonon-4.8.4
  254. +2 −2 metadata/md5-cache/x11-libs/qt-qt3support-4.8.4
  255. +2 −2 metadata/md5-cache/x11-libs/qt-script-4.8.4
  256. +2 −2 metadata/md5-cache/x11-libs/qt-sql-4.8.4
  257. +2 −2 metadata/md5-cache/x11-libs/qt-svg-4.8.4
  258. +2 −2 metadata/md5-cache/x11-libs/qt-test-4.8.4
  259. +2 −2 metadata/md5-cache/x11-libs/qt-xmlpatterns-4.8.4
  260. +1 −1  metadata/md5-cache/x11-misc/piedock-1.6.1
  261. +0 −12 metadata/md5-cache/x11-terms/gnome-terminal-3.2.1
  262. +6 −6 metadata/md5-cache/x11-terms/{gnome-terminal-3.4.1.1 → gnome-terminal-3.6.1-r1}
  263. +1 −1  metadata/news/timestamp.chk
  264. +1 −1  metadata/timestamp
  265. +1 −1  metadata/timestamp.chk
  266. +1 −1  metadata/timestamp.x
  267. +1 −1  net-dialup/moserial/Manifest
  268. +5 −7 net-dialup/moserial/{moserial-3.0.6.ebuild → moserial-3.0.8.ebuild}
  269. +3 −2 net-libs/rest/Manifest
  270. +2 −4 net-libs/rest/metadata.xml
  271. +46 −0 net-libs/rest/rest-0.7.90.ebuild
  272. +26 −0 net-misc/httptype/httptype-1.3.9-r1.ebuild
  273. +4 −4 net-misc/httptype/httptype-1.3.9.ebuild
  274. +1 −4 net-misc/httptype/metadata.xml
  275. +1 −1  net-misc/sparkleshare/Manifest
  276. +0 −85 net-misc/sparkleshare/sparkleshare-0.8.4.ebuild
  277. +40 −0 net-misc/sparkleshare/sparkleshare-1.0.0.ebuild
  278. +0 −1  net-misc/ups-monitor/Manifest
  279. +0 −5 net-misc/ups-monitor/metadata.xml
  280. +0 −35 net-misc/ups-monitor/ups-monitor-0.8.3-r1.ebuild
  281. +2 −2 net-proxy/squid/squid-3.1.22.ebuild
  282. +1 −1  net-wireless/gnome-bluetooth/Manifest
  283. +11 −0 net-wireless/gnome-bluetooth/files/61-gnome-bluetooth.rules
  284. +33 −35 net-wireless/gnome-bluetooth/{gnome-bluetooth-3.2.2.ebuild → gnome-bluetooth-3.6.1.ebuild}
  285. +0 −2  net-wireless/gnome-bluetooth/metadata.xml
  286. +3 −1 profiles/arch/arm/package.use.mask
  287. +3 −4 profiles/arch/hppa/package.use.mask
  288. +5 −3 profiles/hardened/linux/uclibc/mips/package.mask
  289. +1 −14 profiles/package.mask/gentoo
  290. +1 −5 profiles/use.local.desc
  291. +3 −2 sci-mathematics/genius/Manifest
  292. +54 −0 sci-mathematics/genius/genius-1.0.16.ebuild
  293. +1 −1  sys-apps/gnome-disk-utility/Manifest
  294. +0 −92 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.30.1-optional-avahi.patch
  295. +0 −75 sys-apps/gnome-disk-utility/files/gnome-disk-utility-2.91.6-optional-avahi.patch
  296. +0 −71 sys-apps/gnome-disk-utility/gnome-disk-utility-2.32.1.ebuild
  297. +0 −76 sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r200.ebuild
  298. +0 −72 sys-apps/gnome-disk-utility/gnome-disk-utility-3.0.2-r300.ebuild
  299. +19 −10 sys-apps/gnome-disk-utility/{gnome-disk-utility-3.4.0.ebuild → gnome-disk-utility-3.6.1.ebuild}
  300. +2 −2 sys-apps/gnome-disk-utility/metadata.xml
Sorry, we could not display the entire diff because too many files (330) changed.
4 app-admin/logrotate/logrotate-3.8.3.ebuild
View
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.6 2012/12/23 16:58:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/logrotate/logrotate-3.8.3.ebuild,v 1.7 2012/12/24 12:55:47 maekke Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="https://fedorahosted.org/releases/l/o/logrotate/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
IUSE="acl selinux"
RDEPEND="
1  app-admin/mcollective/Manifest
View
@@ -2,3 +2,4 @@ DIST mcollective-1.0.1.tgz 169558 SHA256 4dec52151faedd2baa1226102237b894864716d
DIST mcollective-1.1.4.tgz 918332 SHA256 f7c911f17d6af5e98c30d212ee1dcb2829573b23c92a0ec7c2cd1e3f3d364265 SHA512 096cfd433c817343960f3f18ba29947acf72a66c79c38bda130302d3ac801b1f80183444b080f5c1e56352d99f80f16af21f2dec07af24049a0e54f6601d11bd WHIRLPOOL aa0fdfd5fcda125d6e1b9aaead2233b66a2faca86b6c9907f1c7ff2d3fd47d16e2554eb6391ced45e307a2274e16e0201f79a44ee499ed9c913333a6d8de0091
DIST mcollective-1.2.1.tgz 928316 SHA256 45da06779a1cf9e4efc6f533fa93fe378c6427d6ecc519eea4b53c7ec087b578 SHA512 2e7223f06fc645a1070a5127d111a9619c77b5a03dedd937d25a15881983c6719fc5bde6e94fa7a7d40e21286452061e707968421fc55b0e06b217365638a972 WHIRLPOOL f52f03f07dd537d996e7e8dd39d17605b66d0e30cdba8edd5e9312ab25a795deb90477b9d8aacd672b3f292206e3fd5836c3922c5523bbd693a405a012ceb057
DIST mcollective-2.0.0.tgz 940145 SHA256 4b6e7dc51b86b92f86ddecab59fc376e063f8579433b6a6bdae0d12618b54f0a SHA512 1b64bdc4795dd0bd19772ae8dfccc4516cc865a635a97db5e08dc2b7de88c0904ecc6a9f77f6e49fcc5736d1b9e2f1dedfb6f81eb161b9a322ecabf82d10975a WHIRLPOOL 6f106cfe687a8670a649c9fe48de57e4bf5e37487414545f5908333cbae336fc23f5cafd40a60ce0954f09eee4716e026ac12c46edbc065e484a6f174eb5c4ac
+DIST mcollective-2.2.0.tgz 1011060 SHA256 602b58f70d1bf8f010c0e7e48034da9e971ec9ed51162c5a193d815aa72409f9 SHA512 3544ad68a737bc6ae3571ff4bfe9d51882c7d4104f52431f5dc1a3a8d2197820265ce15954c7f0c75d202bc84ce036f28e624642c09bd71651ab5a99fb469533 WHIRLPOOL c66c411e796af50d55b83db3a625c1c13c067c0be8cf9c7f85928dcbb5afd1ee1c96530cea79aa41ed4eda930f655c49e3e8b3c746a4fcd65552a6256c1b6602
6 app-admin/mcollective/files/mcollectived.initd
View
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/files/mcollectived.initd,v 1.1 2011/03/01 02:18:33 ramereth Exp $
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the Apache License, Version 2.0
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/files/mcollectived.initd,v 1.2 2012/12/24 08:29:38 ramereth Exp $
mcollectived="/usr/sbin/mcollectived"
pidfile="/var/run/mcollectived"
60 app-admin/mcollective/mcollective-2.2.0.ebuild
View
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mcollective/mcollective-2.2.0.ebuild,v 1.1 2012/12/24 08:29:38 ramereth Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ree18"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="http://marionette-collective.org/"
+SRC_URI="http://puppetlabs.com/downloads/mcollective/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+ einfo "nothing to compile"
+}
+
+each_ruby_install() {
+ doruby -r lib/*
+ insinto /usr/share/mcollective
+ doins -r plugins
+ use client && dosbin bin/mc-* bin/mco
+ dosbin bin/mcollectived
+ if use doc ; then
+ dohtml -r website/*
+ insinto /usr/share/doc/${P}/ext
+ doins -r ext/*
+ fi
+ newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+ insinto /etc/mcollective
+ cd etc
+ for cfg in *.dist ; do
+ newins "${cfg}" "${cfg%%.dist}"
+ sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+ "${D}"/etc/mcollective/${cfg%%.dist}
+ done
+ insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+ einfo "Mcollective requires a stomp server installed and functioning before"
+ einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+ einfo "any other stomp compatible server should work."
+ einfo
+ einfo "It is recommended you read the \'getting started\' guide [2] if this"
+ einfo "is a new installation"
+ einfo
+ einfo "[1] http://activemq.apache.org/"
+ einfo "[2] http://code.google.com/p/mcollective/wiki/GettingStarted"
+}
1  app-admin/sysstat/Manifest
View
@@ -3,3 +3,4 @@ DIST sysstat-10.0.4.tar.bz2 276962 SHA256 55d6664bdfe72b3291100627a5e301189d2918
DIST sysstat-10.0.5.tar.bz2 282403 SHA256 3e96fdc8d6710f4b642757ff88e3c4296d55838b64ff102feaaf2175f66e875b SHA512 d40cb67c61f499445dee803ac54af50704aa49a4d20b11b5aaaf8966ab6eacfbc72d30c933cf678e324d283818cb5a0beb55cddeb689b0c3a1fdeb4813b4ac63 WHIRLPOOL 868cbbcc179e5810a9b5f1af214974f949c15f0b7f8a114554f85aeb23a755be17fa76f0c24303de9b274c438097d2c2f5f48b421c275977b8bea58e49d01ac4
DIST sysstat-10.1.1.tar.bz2 291513 SHA256 e39e3a5f1f4cd88f2182c1bfc0524e1a0c7a559c1e8294656b5fcd293d99e6c5 SHA512 1f4dbeecb9c240eb76abe45cea7ab22ef01c3774d06c81ed7a9811ed778a10c4975cb870e62009a459b42d232f109b7c6a5f32a2ae70d7f66c9b22bf2f1c73db WHIRLPOOL 4c78a3590f53e36e1155edd82be0c58a05e0c2dbaa9dff5b2c8f1355f1627a2ce2e9c20f411c57ef06b33e9f8ab68f73f62d7f04eb2f23e3d6c5716c11a19773
DIST sysstat-10.1.2.tar.bz2 293308 SHA256 996a5193c6508c6acdbabb0bfa6728170a918644221948ffe900e83a4f444502 SHA512 63f302fd6cd0e6231032fc78a754941cd404bd2ab46ca8c4187aa8f9438643ea984bc8d6db67c201572ab9e790952c36f6302ab5e0795247d8883fe365f9327b WHIRLPOOL f5598cc7cf096fb0cac632c3208bed33b447d90efd65b02c38d97887d4533affb0fab9329da1cd3332caaf5326d5475f436e67b46361336c4a7d2bbd7a4f9544
+DIST sysstat-10.1.3.tar.bz2 295045 SHA256 ea0c07f170a765aa080e912087c15bf11453d5bf0d01fd7465d1bb760a1d7f12 SHA512 7225cad806a0da84f4032d668a157f285cbff18480ec0b44533aff22f8fa7d0ddc885efa505aefb83acb18f25c6673a4e7e147b65c2a3747bb6300466a3668d1 WHIRLPOOL daa39d10c949228f60375dd032fee154b7c5928ada9eecdf5c76391471760d942465c6b3847808d804fc19b64a804d79a0f7827316d8c12e8c40f38c15062dc7
92 app-admin/sysstat/sysstat-10.1.3.ebuild
View
@@ -0,0 +1,92 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/sysstat/sysstat-10.1.3.ebuild,v 1.2 2012/12/24 17:35:33 jer Exp $
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cron debug +doc isag nls lm_sensors"
+
+SYSSTAT_LINGUAS="
+ af cs da de eo es eu fi fr hr id it ja ky lv mt nb nl nn pl pt pt_BR ro ru
+ sk sr sv uk vi zh_CN zh_TW
+"
+
+for SYSSTAT_LINGUA in ${SYSSTAT_LINGUAS}; do
+ IUSE="${IUSE} linguas_${SYSSTAT_LINGUA}"
+done
+
+RDEPEND="
+ cron? ( sys-process/cronbase )
+ isag? (
+ dev-lang/tk
+ dev-vcs/rcs
+ sci-visualization/gnuplot
+ )
+ nls? ( virtual/libintl )
+ lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ local po_count li_count lingua NLSDIR="${S}/nls"
+
+ count() { echo ${#}; }
+ po_count=$(count ${NLSDIR}/*.po)
+ li_count=$(count ${SYSSTAT_LINGUAS})
+ [[ ${po_count} = ${li_count} ]] \
+ || die "Number of LINGUAS does not match number of .po files"
+ unset count
+
+ for lingua in ${SYSSTAT_LINGUAS}; do
+ if ! use linguas_${lingua}; then
+ rm -f "${NLSDIR}/${lingua}.po" || die
+ fi
+ done
+ epatch "${FILESDIR}"/${PN}-10.0.4-flags.patch
+}
+
+src_configure() {
+ sa_lib_dir=/usr/$(get_libdir)/sa \
+ conf_dir=/etc \
+ rcdir=Gentoo-does-not-use-rc.d \
+ econf \
+ $(use_enable cron install-cron) \
+ $(use_enable debug debuginfo) \
+ $(use_enable doc documentation ) \
+ $(use_enable isag install-isag) \
+ $(use_enable lm_sensors sensors) \
+ $(use_enable nls)
+}
+
+src_compile() {
+ emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ keepdir /var/log/sa
+
+ use cron && dodir /etc/cron.{daily,hourly}
+
+ emake \
+ DESTDIR="${D}" \
+ DOC_DIR=/usr/share/doc/${PF} \
+ install
+
+ dodoc contrib/sargraph/sargraph
+
+ newinitd "${FILESDIR}"/sysstat.init.d sysstat
+
+ use doc && rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
73 app-crypt/mit-krb5/files/2011-006-patch-r18.patch
View
@@ -1,73 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index 498c0de..5f973fb 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -158,13 +158,23 @@ krb5_db2_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
- &lockout_duration);
- if (code != 0)
- return code;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
- /*
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 626ed1f..68e8ec4 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -131,6 +131,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- CHECK_LDAP_HANDLE(ldap_context);
-
- if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+ st = KRB5_KDB_NOENTRY;
- *more = 0;
- krb5_set_error_message (context, st, "Principal does not belong to realm");
- goto cleanup;
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index 020c77a..24b9493 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -150,15 +150,25 @@ krb5_ldap_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
- &lockout_duration);
- if (code != 0)
- return code;
-
-- entry->mask = 0;
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ entry->mask = 0;
-
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
- /*
33 app-crypt/mit-krb5/files/CVE-2010-1322.patch
View
@@ -1,33 +0,0 @@
-diff --git a/src/kdc/kdc_authdata.c b/src/kdc/kdc_authdata.c
-index b5de64d..cc44e29 100644
---- a/src/kdc/kdc_authdata.c
-+++ b/src/kdc/kdc_authdata.c
-@@ -495,7 +495,7 @@ merge_authdata (krb5_context context,
- krb5_boolean copy,
- krb5_boolean ignore_kdc_issued)
- {
-- size_t i, nadata = 0;
-+ size_t i, j, nadata = 0;
- krb5_authdata **authdata = *out_authdata;
-
- if (in_authdata == NULL || in_authdata[0] == NULL)
-@@ -529,16 +529,16 @@ merge_authdata (krb5_context context,
- in_authdata = tmp;
- }
-
-- for (i = 0; in_authdata[i] != NULL; i++) {
-+ for (i = 0, j = 0; in_authdata[i] != NULL; i++) {
- if (ignore_kdc_issued &&
- is_kdc_issued_authdatum(context, in_authdata[i], 0)) {
- free(in_authdata[i]->contents);
- free(in_authdata[i]);
- } else
-- authdata[nadata + i] = in_authdata[i];
-+ authdata[nadata + j++] = in_authdata[i];
- }
-
-- authdata[nadata + i] = NULL;
-+ authdata[nadata + j] = NULL;
-
- free(in_authdata);
-
202 app-crypt/mit-krb5/files/CVE-2010-1323.1324.4020.patch
View
@@ -1,202 +0,0 @@
-Index: krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c
-===================================================================
---- krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c (revision 24455)
-+++ krb5-1.8/src/plugins/preauth/pkinit/pkinit_srv.c (working copy)
-@@ -691,8 +691,7 @@
- krb5_reply_key_pack *key_pack = NULL;
- krb5_reply_key_pack_draft9 *key_pack9 = NULL;
- krb5_data *encoded_key_pack = NULL;
-- unsigned int num_types;
-- krb5_cksumtype *cksum_types = NULL;
-+ krb5_cksumtype cksum_type;
-
- pkinit_kdc_context plgctx;
- pkinit_kdc_req_context reqctx;
-@@ -882,14 +881,25 @@
- retval = ENOMEM;
- goto cleanup;
- }
-- /* retrieve checksums for a given enctype of the reply key */
-- retval = krb5_c_keyed_checksum_types(context,
-- encrypting_key->enctype, &num_types, &cksum_types);
-- if (retval)
-- goto cleanup;
-
-- /* pick the first of acceptable enctypes for the checksum */
-- retval = krb5_c_make_checksum(context, cksum_types[0],
-+ switch (encrypting_key->enctype) {
-+ case ENCTYPE_DES_CBC_MD4:
-+ cksum_type = CKSUMTYPE_RSA_MD4_DES;
-+ break;
-+ case ENCTYPE_DES_CBC_MD5:
-+ case ENCTYPE_DES_CBC_CRC:
-+ cksum_type = CKSUMTYPE_RSA_MD5_DES;
-+ break;
-+ default:
-+ retval = krb5int_c_mandatory_cksumtype(context,
-+ encrypting_key->enctype,
-+ &cksum_type);
-+ if (retval)
-+ goto cleanup;
-+ break;
-+ }
-+
-+ retval = krb5_c_make_checksum(context, cksum_type,
- encrypting_key, KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM,
- req_pkt, &key_pack->asChecksum);
- if (retval) {
-@@ -1033,7 +1043,6 @@
- krb5_free_data(context, encoded_key_pack);
- free(dh_pubkey);
- free(server_key);
-- free(cksum_types);
-
- switch ((int)padata->pa_type) {
- case KRB5_PADATA_PK_AS_REQ:
-Index: krb5-1.8/src/lib/crypto/krb/cksumtypes.c
-===================================================================
---- krb5-1.8/src/lib/crypto/krb/cksumtypes.c (revision 24455)
-+++ krb5-1.8/src/lib/crypto/krb/cksumtypes.c (working copy)
-@@ -101,7 +101,7 @@
-
- { CKSUMTYPE_MD5_HMAC_ARCFOUR,
- "md5-hmac-rc4", { 0 }, "Microsoft MD5 HMAC",
-- NULL, &krb5int_hash_md5,
-+ &krb5int_enc_arcfour, &krb5int_hash_md5,
- krb5int_hmacmd5_checksum, NULL,
- 16, 16, 0 },
- };
-Index: krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c
-===================================================================
---- krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c (revision 24455)
-+++ krb5-1.8/src/lib/crypto/krb/keyed_checksum_types.c (working copy)
-@@ -35,6 +35,13 @@
- {
- if (ctp->flags & CKSUM_UNKEYED)
- return FALSE;
-+ /* Stream ciphers do not play well with RFC 3961 key derivation, so be
-+ * conservative with RC4. */
-+ if ((ktp->etype == ENCTYPE_ARCFOUR_HMAC ||
-+ ktp->etype == ENCTYPE_ARCFOUR_HMAC_EXP) &&
-+ ctp->ctype != CKSUMTYPE_HMAC_MD5_ARCFOUR &&
-+ ctp->ctype != CKSUMTYPE_MD5_HMAC_ARCFOUR)
-+ return FALSE;
- return (!ctp->enc || ktp->enc == ctp->enc);
- }
-
-Index: krb5-1.8/src/lib/crypto/krb/dk/derive.c
-===================================================================
---- krb5-1.8/src/lib/crypto/krb/dk/derive.c (revision 24455)
-+++ krb5-1.8/src/lib/crypto/krb/dk/derive.c (working copy)
-@@ -91,6 +91,8 @@
- blocksize = enc->block_size;
- keybytes = enc->keybytes;
-
-+ if (blocksize == 1)
-+ return KRB5_BAD_ENCTYPE;
- if (inkey->keyblock.length != enc->keylength || outrnd->length != keybytes)
- return KRB5_CRYPTO_INTERNAL;
-
-Index: krb5-1.8/src/lib/gssapi/krb5/util_crypt.c
-===================================================================
---- krb5-1.8/src/lib/gssapi/krb5/util_crypt.c (revision 24455)
-+++ krb5-1.8/src/lib/gssapi/krb5/util_crypt.c (working copy)
-@@ -119,10 +119,22 @@
- if (code != 0)
- return code;
-
-- code = (*kaccess.mandatory_cksumtype)(context, subkey->keyblock.enctype,
-- cksumtype);
-- if (code != 0)
-- return code;
-+ switch (subkey->keyblock.enctype) {
-+ case ENCTYPE_DES_CBC_MD4:
-+ *cksumtype = CKSUMTYPE_RSA_MD4_DES;
-+ break;
-+ case ENCTYPE_DES_CBC_MD5:
-+ case ENCTYPE_DES_CBC_CRC:
-+ *cksumtype = CKSUMTYPE_RSA_MD5_DES;
-+ break;
-+ default:
-+ code = (*kaccess.mandatory_cksumtype)(context,
-+ subkey->keyblock.enctype,
-+ cksumtype);
-+ if (code != 0)
-+ return code;
-+ break;
-+ }
-
- switch (subkey->keyblock.enctype) {
- case ENCTYPE_DES_CBC_MD5:
-Index: krb5-1.8/src/lib/krb5/krb/pac.c
-===================================================================
---- krb5-1.8/src/lib/krb5/krb/pac.c (revision 24455)
-+++ krb5-1.8/src/lib/krb5/krb/pac.c (working copy)
-@@ -582,6 +582,8 @@
- checksum.checksum_type = load_32_le(p);
- checksum.length = checksum_data.length - PAC_SIGNATURE_DATA_LENGTH;
- checksum.contents = p + PAC_SIGNATURE_DATA_LENGTH;
-+ if (!krb5_c_is_keyed_cksum(checksum.checksum_type))
-+ return KRB5KRB_AP_ERR_INAPP_CKSUM;
-
- pac_data.length = pac->data.length;
- pac_data.data = malloc(pac->data.length);
-Index: krb5-1.8/src/lib/krb5/krb/preauth2.c
-===================================================================
---- krb5-1.8/src/lib/krb5/krb/preauth2.c (revision 24455)
-+++ krb5-1.8/src/lib/krb5/krb/preauth2.c (working copy)
-@@ -1578,7 +1578,9 @@
-
- cksum = sc2->sam_cksum;
-
-- while (*cksum) {
-+ for (; *cksum; cksum++) {
-+ if (!krb5_c_is_keyed_cksum((*cksum)->checksum_type))
-+ continue;
- /* Check this cksum */
- retval = krb5_c_verify_checksum(context, as_key,
- KRB5_KEYUSAGE_PA_SAM_CHALLENGE_CKSUM,
-@@ -1592,7 +1594,6 @@
- }
- if (valid_cksum)
- break;
-- cksum++;
- }
-
- if (!valid_cksum) {
-Index: krb5-1.8/src/lib/krb5/krb/mk_safe.c
-===================================================================
---- krb5-1.8/src/lib/krb5/krb/mk_safe.c (revision 24455)
-+++ krb5-1.8/src/lib/krb5/krb/mk_safe.c (working copy)
-@@ -215,10 +215,28 @@
- for (i = 0; i < nsumtypes; i++)
- if (auth_context->safe_cksumtype == sumtypes[i])
- break;
-- if (i == nsumtypes)
-- i = 0;
-- sumtype = sumtypes[i];
- krb5_free_cksumtypes (context, sumtypes);
-+ if (i < nsumtypes)
-+ sumtype = auth_context->safe_cksumtype;
-+ else {
-+ switch (enctype) {
-+ case ENCTYPE_DES_CBC_MD4:
-+ sumtype = CKSUMTYPE_RSA_MD4_DES;
-+ break;
-+ case ENCTYPE_DES_CBC_MD5:
-+ case ENCTYPE_DES_CBC_CRC:
-+ sumtype = CKSUMTYPE_RSA_MD5_DES;
-+ break;
-+ default:
-+ retval = krb5int_c_mandatory_cksumtype(context, enctype,
-+ &sumtype);
-+ if (retval) {
-+ CLEANUP_DONE();
-+ goto error;
-+ }
-+ break;
-+ }
-+ }
- }
- if ((retval = krb5_mk_safe_basic(context, userdata, key, &replaydata,
- plocal_fulladdr, premote_fulladdr,
19 app-crypt/mit-krb5/files/CVE-2010-4022.patch
View
@@ -1,19 +0,0 @@
-diff -up krb5/src/slave/kpropd.c krb5/src/slave/kpropd.c
---- krb5/src/slave/kpropd.c 2010-12-17 11:14:26.000000000 -0500
-+++ krb5/src/slave/kpropd.c 2010-12-17 11:41:19.000000000 -0500
-@@ -404,11 +404,11 @@ retry:
- }
-
- close(s);
-- if (iproprole == IPROP_SLAVE)
-+ if (iproprole == IPROP_SLAVE) {
- close(finet);
--
-- if ((ret = WEXITSTATUS(status)) != 0)
-- return (ret);
-+ if ((ret = WEXITSTATUS(status)) != 0)
-+ return (ret);
-+ }
- }
- if (iproprole == IPROP_SLAVE)
- break;
126 app-crypt/mit-krb5/files/CVE-2011-0281.0282.0283.patch
View
@@ -1,126 +0,0 @@
-diff --git a/src/kdc/dispatch.c b/src/kdc/dispatch.c
-index 63ff3b3..b4a90bb 100644
---- a/src/kdc/dispatch.c
-+++ b/src/kdc/dispatch.c
-@@ -115,7 +115,8 @@ dispatch(void *cb, struct sockaddr *local_saddr, const krb5_fulladdr *from,
- kdc_insert_lookaside(pkt, *response);
- #endif
-
-- if (is_tcp == 0 && (*response)->length > max_dgram_reply_size) {
-+ if (is_tcp == 0 && *response != NULL &&
-+ (*response)->length > max_dgram_reply_size) {
- too_big_for_udp:
- krb5_free_data(kdc_context, *response);
- retval = make_too_big_error(response);
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-index d677bb2..a356907 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-@@ -102,14 +102,18 @@ extern void prepend_err_str (krb5_context ctx, const char *s, krb5_error_code er
- #define LDAP_SEARCH(base, scope, filter, attrs) LDAP_SEARCH_1(base, scope, filter, attrs, CHECK_STATUS)
-
- #define LDAP_SEARCH_1(base, scope, filter, attrs, status_check) \
-- do { \
-- st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, NULL, &timelimit, LDAP_NO_LIMIT, &result); \
-- if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
-- tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
-- if (ldap_server_handle) \
-- ld = ldap_server_handle->ldap_handle; \
-- } \
-- }while (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR && tempst == 0); \
-+ tempst = 0; \
-+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, \
-+ NULL, &timelimit, LDAP_NO_LIMIT, &result); \
-+ if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
-+ tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
-+ if (ldap_server_handle) \
-+ ld = ldap_server_handle->ldap_handle; \
-+ if (tempst == 0) \
-+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, \
-+ NULL, NULL, &timelimit, \
-+ LDAP_NO_LIMIT, &result); \
-+ } \
- \
- if (status_check != IGNORE_STATUS) { \
- if (tempst != 0) { \
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-index 82b0333..84e80ee 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-@@ -302,6 +302,7 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context,
- {
- krb5_ldap_server_handle *handle = *ldap_server_handle;
-
-+ ldap_unbind_ext_s(handle->ldap_handle, NULL, NULL);
- if ((ldap_initialize(&handle->ldap_handle, handle->server_info->server_name) != LDAP_SUCCESS)
- || (krb5_ldap_bind(ldap_context, handle) != LDAP_SUCCESS))
- return krb5_ldap_request_next_handle_from_pool(ldap_context, ldap_server_handle);
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-index 86fa4d1..0f49c86 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-@@ -487,12 +487,11 @@ is_principal_in_realm(krb5_ldap_context *ldap_context,
- * portion, then the first portion of the principal name SHOULD be
- * "krbtgt". All this check is done in the immediate block.
- */
-- if (searchfor->length == 2)
-- if ((strncasecmp(searchfor->data[0].data, "krbtgt",
-- FIND_MAX(searchfor->data[0].length, strlen("krbtgt"))) == 0) &&
-- (strncasecmp(searchfor->data[1].data, defrealm,
-- FIND_MAX(searchfor->data[1].length, defrealmlen)) == 0))
-+ if (searchfor->length == 2) {
-+ if (data_eq_string(searchfor->data[0], "krbtgt") &&
-+ data_eq_string(searchfor->data[1], defrealm))
- return 0;
-+ }
-
- /* first check the length, if they are not equal, then they are not same */
- if (strlen(defrealm) != searchfor->realm.length)
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 140db1a..552e39a 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -78,10 +78,10 @@ krb5_error_code
- krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- unsigned int flags, krb5_db_entry **entry_ptr)
- {
-- char *user=NULL, *filter=NULL, **subtree=NULL;
-+ char *user=NULL, *filter=NULL, *filtuser=NULL;
- unsigned int tree=0, ntrees=1, princlen=0;
- krb5_error_code tempst=0, st=0;
-- char **values=NULL, *cname=NULL;
-+ char **values=NULL, **subtree=NULL, *cname=NULL;
- LDAP *ld=NULL;
- LDAPMessage *result=NULL, *ent=NULL;
- krb5_ldap_context *ldap_context=NULL;
-@@ -115,12 +115,18 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- if ((st=krb5_ldap_unparse_principal_name(user)) != 0)
- goto cleanup;
-
-- princlen = strlen(FILTER) + strlen(user) + 2 + 1; /* 2 for closing brackets */
-+ filtuser = ldap_filter_correct(user);
-+ if (filtuser == NULL) {
-+ st = ENOMEM;
-+ goto cleanup;
-+ }
-+
-+ princlen = strlen(FILTER) + strlen(filtuser) + 2 + 1; /* 2 for closing brackets */
- if ((filter = malloc(princlen)) == NULL) {
- st = ENOMEM;
- goto cleanup;
- }
-- snprintf(filter, princlen, FILTER"%s))", user);
-+ snprintf(filter, princlen, FILTER"%s))", filtuser);
-
- if ((st = krb5_get_subtree_info(ldap_context, &subtree, &ntrees)) != 0)
- goto cleanup;
-@@ -207,6 +213,9 @@ cleanup:
- if (user)
- free(user);
-
-+ if (filtuser)
-+ free(filtuser);
-+
- if (cname)
- free(cname);
-
13 app-crypt/mit-krb5/files/CVE-2011-0284.patch
View
@@ -1,13 +0,0 @@
-diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
-index 46b5fa1..464cb6e 100644
---- a/src/kdc/do_as_req.c
-+++ b/src/kdc/do_as_req.c
-@@ -741,6 +741,8 @@ prepare_error_as (struct kdc_request_state *rstate, krb5_kdc_req *request,
- pad->contents = td[size]->data;
- pad->length = td[size]->length;
- pa[size] = pad;
-+ td[size]->data = NULL;
-+ td[size]->length = 0;
- }
- krb5_free_typed_data(kdc_context, td);
- }
39 app-crypt/mit-krb5/files/CVE-2011-0285.patch
View
@@ -1,39 +0,0 @@
-diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
-index 1124445..0056885 100644
---- a/src/kadmin/server/schpw.c
-+++ b/src/kadmin/server/schpw.c
-@@ -52,6 +52,7 @@ process_chpw_request(context, server_handle, realm, keytab,
-
- ret = 0;
- rep->length = 0;
-+ rep->data = NULL;
-
- auth_context = NULL;
- changepw = NULL;
-@@ -76,8 +77,13 @@ process_chpw_request(context, server_handle, realm, keytab,
- plen = (*ptr++ & 0xff);
- plen = (plen<<8) | (*ptr++ & 0xff);
-
-- if (plen != req->length)
-- return(KRB5KRB_AP_ERR_MODIFIED);
-+ if (plen != req->length) {
-+ ret = KRB5KRB_AP_ERR_MODIFIED;
-+ numresult = KRB5_KPASSWD_MALFORMED;
-+ strlcpy(strresult, "Request length was inconsistent",
-+ sizeof(strresult));
-+ goto chpwfail;
-+ }
-
- /* verify version number */
-
-@@ -531,6 +537,10 @@ cleanup:
- if (local_kaddrs != NULL)
- krb5_free_addresses(server_handle->context, local_kaddrs);
-
-+ if ((*response)->data == NULL) {
-+ free(*response);
-+ *response = NULL;
-+ }
- krb5_kt_close(server_handle->context, kt);
-
- return ret;
40 app-crypt/mit-krb5/files/CVE-2011-1530.patch
View
@@ -1,40 +0,0 @@
-diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
-index f46cad3..102fbaa 100644
---- a/src/kdc/Makefile.in
-+++ b/src/kdc/Makefile.in
-@@ -67,6 +67,7 @@ check-unix:: rtest
-
- check-pytests::
- $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
-+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
-
- install::
- $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index c169c54..840a2ef 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -243,7 +243,8 @@ tgt_again:
- if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
- errcode = find_alternate_tgs(request, &server);
- firstpass = 0;
-- goto tgt_again;
-+ if (errcode == 0)
-+ goto tgt_again;
- }
- }
- status = "UNKNOWN_SERVER";
-diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
-new file mode 100644
-index 0000000..1760bcd
---- /dev/null
-+++ b/src/kdc/t_emptytgt.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/python
-+from k5test import *
-+
-+realm = K5Realm(start_kadmind=False, create_host=False)
-+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
-+if 'not found in Kerberos database' not in output:
-+ fail('TGT lookup for empty realm failed in unexpected way')
-+success('Empty tgt lookup.')
13 app-crypt/mit-krb5/files/mit-krb5-1.10_uninitialized.patch
View
@@ -1,13 +0,0 @@
-diff --git a/tests/asn.1/trval.c b/tests/asn.1/trval.c
-index 780d60c..ffd66ac 100644
---- a/tests/asn.1/trval.c
-+++ b/tests/asn.1/trval.c
-@@ -176,7 +176,7 @@ int trval2(fp, enc, len, lev, rlen)
- int lev;
- int *rlen;
- {
-- int l, eid, elen, xlen, r, rlen2;
-+ int l, eid, elen, xlen, r, rlen2 = 0;
- int rlen_ext = 0;
-
- r = OK;
10 app-crypt/mit-krb5/files/mit-krb5-1.11_uninitialized.patch
View
@@ -55,3 +55,13 @@ index 7dc5b47..cd90db8 100644
*ret_new_profile = NULL;
+--- a/src/lib/krb5/krb/preauth2.c 2012-12-24 12:39:18.432678497 +0100
++++ b/src/lib/krb5/krb/preauth2.c 2012-12-24 12:50:49.444099126 +0100
+@@ -956,7 +956,7 @@
+ size_t i, h;
+ int out_pa_list_size = 0;
+ krb5_pa_data **out_pa_list = NULL;
+- krb5_error_code ret, module_ret;
++ krb5_error_code ret, module_ret = 0;
+ krb5_responder_fn responder = opte->opt_private->responder;
+ static const int paorder[] = { PA_INFO, PA_REAL };
112 app-crypt/mit-krb5/files/mit-krb5-1.8.3-CVE-2011-0281.0282.0283.patch
View
@@ -1,112 +0,0 @@
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-index 1ca09b4..60caf3d 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
-@@ -102,14 +102,18 @@ extern void prepend_err_str (krb5_context ctx, const char *s, krb5_error_code er
- #define LDAP_SEARCH(base, scope, filter, attrs) LDAP_SEARCH_1(base, scope, filter, attrs, CHECK_STATUS)
-
- #define LDAP_SEARCH_1(base, scope, filter, attrs, status_check) \
-- do { \
-- st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, NULL, &timelimit, LDAP_NO_LIMIT, &result); \
-- if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
-- tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
-- if (ldap_server_handle) \
-- ld = ldap_server_handle->ldap_handle; \
-- } \
-- }while (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR && tempst == 0); \
-+ tempst = 0; \
-+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, NULL, \
-+ NULL, &timelimit, LDAP_NO_LIMIT, &result); \
-+ if (translate_ldap_error(st, OP_SEARCH) == KRB5_KDB_ACCESS_ERROR) { \
-+ tempst = krb5_ldap_rebind(ldap_context, &ldap_server_handle); \
-+ if (ldap_server_handle) \
-+ ld = ldap_server_handle->ldap_handle; \
-+ if (tempst == 0) \
-+ st = ldap_search_ext_s(ld, base, scope, filter, attrs, 0, \
-+ NULL, NULL, &timelimit, \
-+ LDAP_NO_LIMIT, &result); \
-+ } \
- \
- if (status_check != IGNORE_STATUS) { \
- if (tempst != 0) { \
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-index 82b0333..84e80ee 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
-@@ -302,6 +302,7 @@ krb5_ldap_rebind(krb5_ldap_context *ldap_context,
- {
- krb5_ldap_server_handle *handle = *ldap_server_handle;
-
-+ ldap_unbind_ext_s(handle->ldap_handle, NULL, NULL);
- if ((ldap_initialize(&handle->ldap_handle, handle->server_info->server_name) != LDAP_SUCCESS)
- || (krb5_ldap_bind(ldap_context, handle) != LDAP_SUCCESS))
- return krb5_ldap_request_next_handle_from_pool(ldap_context, ldap_server_handle);
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-index f549e23..b70940f 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
-@@ -446,12 +446,11 @@ is_principal_in_realm(krb5_ldap_context *ldap_context,
- * portion, then the first portion of the principal name SHOULD be
- * "krbtgt". All this check is done in the immediate block.
- */
-- if (searchfor->length == 2)
-- if ((strncasecmp(searchfor->data[0].data, "krbtgt",
-- FIND_MAX(searchfor->data[0].length, strlen("krbtgt"))) == 0) &&
-- (strncasecmp(searchfor->data[1].data, defrealm,
-- FIND_MAX(searchfor->data[1].length, defrealmlen)) == 0))
-+ if (searchfor->length == 2) {
-+ if (data_eq_string(searchfor->data[0], "krbtgt") &&
-+ data_eq_string(searchfor->data[1], defrealm))
- return 0;
-+ }
-
- /* first check the length, if they are not equal, then they are not same */
- if (strlen(defrealm) != searchfor->realm.length)
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 7ad31da..626ed1f 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -103,10 +103,10 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- unsigned int flags, krb5_db_entry *entries,
- int *nentries, krb5_boolean *more)
- {
-- char *user=NULL, *filter=NULL, **subtree=NULL;
-+ char *user=NULL, *filter=NULL, *filtuser=NULL;
- unsigned int tree=0, ntrees=1, princlen=0;
- krb5_error_code tempst=0, st=0;
-- char **values=NULL, *cname=NULL;
-+ char **values=NULL, **subtree=NULL, *cname=NULL;
- LDAP *ld=NULL;
- LDAPMessage *result=NULL, *ent=NULL;
- krb5_ldap_context *ldap_context=NULL;
-@@ -142,12 +142,18 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- if ((st=krb5_ldap_unparse_principal_name(user)) != 0)
- goto cleanup;
-
-- princlen = strlen(FILTER) + strlen(user) + 2 + 1; /* 2 for closing brackets */
-+ filtuser = ldap_filter_correct(user);
-+ if (filtuser == NULL) {
-+ st = ENOMEM;
-+ goto cleanup;
-+ }
-+
-+ princlen = strlen(FILTER) + strlen(filtuser) + 2 + 1; /* 2 for closing brackets */
- if ((filter = malloc(princlen)) == NULL) {
- st = ENOMEM;
- goto cleanup;
- }
-- snprintf(filter, princlen, FILTER"%s))", user);
-+ snprintf(filter, princlen, FILTER"%s))", filtuser);
-
- if ((st = krb5_get_subtree_info(ldap_context, &subtree, &ntrees)) != 0)
- goto cleanup;
-@@ -231,6 +237,9 @@ cleanup:
- if (user)
- free(user);
-
-+ if (filtuser)
-+ free(filtuser);
-+
- if (cname)
- free(cname);
-
35 app-crypt/mit-krb5/files/mit-krb5-1.8.3-CVE-2011-0285.patch
View
@@ -1,35 +0,0 @@
-diff --git a/src/kadmin/server/network.c b/src/kadmin/server/network.c
-index c8ce4f1..bb911ff 100644
---- a/src/kadmin/server/network.c
-+++ b/src/kadmin/server/network.c
-@@ -1384,6 +1384,10 @@ cleanup:
- if (local_kaddrs != NULL)
- krb5_free_addresses(server_handle->context, local_kaddrs);
-
-+ if ((*response)->data == NULL) {
-+ free(*response);
-+ *response = NULL;
-+ }
- krb5_kt_close(server_handle->context, kt);
-
- return ret;
-diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
-index c1b2217..992b55f 100644
---- a/src/kadmin/server/schpw.c
-+++ b/src/kadmin/server/schpw.c
-@@ -74,8 +74,13 @@ process_chpw_request(context, server_handle, realm, keytab,
- plen = (*ptr++ & 0xff);
- plen = (plen<<8) | (*ptr++ & 0xff);
-
-- if (plen != req->length)
-- return(KRB5KRB_AP_ERR_MODIFIED);
-+ if (plen != req->length) {
-+ ret = KRB5KRB_AP_ERR_MODIFIED;
-+ numresult = KRB5_KPASSWD_MALFORMED;
-+ strlcpy(strresult, "Request length was inconsistent",
-+ sizeof(strresult));
-+ goto chpwfail;
-+ }
-
- /* verify version number */
-
25 app-crypt/mit-krb5/files/mit-krb5-kprop_exit_on_error.patch
View
@@ -1,25 +0,0 @@
-http://krbdev.mit.edu/rt/Ticket/Display.html?id=7000
-
-Index: trunk/src/kadmin/server/ipropd_svc.c
-===================================================================
-diff -u -N -r24961 -r25433
---- trunk/src/kadmin/server/ipropd_svc.c (.../ipropd_svc.c) (revision 24961)
-+++ trunk/src/kadmin/server/ipropd_svc.c (.../ipropd_svc.c) (revision 25433)
-@@ -380,7 +380,7 @@
- _("%s: pclose(popen) failed: %s"),
- whoami,
- error_message(errno));
-- goto out;
-+ _exit(1);
- }
-
- DPRINT(("%s: exec `kprop -f %s %s' ...\n",
-@@ -401,7 +401,7 @@
- _("%s: exec failed: %s"),
- whoami,
- error_message(errno));
-- goto out;
-+ _exit(1);
- }
-
- default: /* parent */
93 app-crypt/mit-krb5/files/mit-krb5_testsuite.patch
View
@@ -1,93 +0,0 @@
---- a/src/tests/dejagnu/config/default.exp 2010-04-21 01:37:22.000000000 +0300
-+++ b/src/tests/dejagnu/config/default.exp 2010-11-24 16:51:53.000000000 +0200
-@@ -1619,7 +1619,7 @@
- set spawnid $spawn_id
- set pid [exp_pid]
-
-- set markstr "===MARK $pid [clock format [clock seconds]] ==="
-+ set markstr "===MARK $pid [clock seconds] ==="
- puts $f $markstr
- flush $f
-
---- a/src/tests/dejagnu/krb-standalone/gssapi.exp 2009-06-11 20:27:45.000000000 +0300
-+++ b/src/tests/dejagnu/krb-standalone/gssapi.exp 2010-11-24 16:52:21.000000000 +0200
-@@ -182,7 +182,7 @@
- }
- }
- catch "expect_after"
-- if ![check_exit_status $test] {
-+ if { [check_exit_status $test] == 0 } {
- # check_exit_staus already calls fail for us
- return
- }
-@@ -209,59 +209,59 @@
- global portbase
-
- # Start up the kerberos and kadmind daemons.
-- if ![start_kerberos_daemons 0] {
-+ if { [start_kerberos_daemons 0] == 0 } {
- perror "failed to start kerberos daemons"
- }
-
- # Use kadmin to add a key for us.
-- if ![add_kerberos_key gsstest0 0] {
-+ if { [add_kerberos_key gsstest0 0] == 0 } {
- perror "failed to set up gsstest0 key"
- }
-
- # Use kadmin to add a key for us.
-- if ![add_kerberos_key gsstest1 0] {
-+ if { [add_kerberos_key gsstest1 0] ==0 } {
- perror "failed to set up gsstest1 key"
- }
-
- # Use kadmin to add a key for us.
-- if ![add_kerberos_key gsstest2 0] {
-+ if { [add_kerberos_key gsstest2 0] == 0 } {
- perror "failed to set up gsstest2 key"
- }
-
- # Use kadmin to add a key for us.
-- if ![add_kerberos_key gsstest3 0] {
-+ if { [add_kerberos_key gsstest3 0] == 0 } {
- perror "failed to set up gsstest3 key"
- }
-
- # Use kadmin to add a service key for us.
-- if ![add_random_key gssservice/$hostname 0] {
-+ if { [add_random_key gssservice/$hostname 0] == 0 } {
- perror "failed to set up gssservice/$hostname key"
- }
-
- # Use kdb5_edit to create a srvtab entry for gssservice
-- if ![setup_srvtab 0 gssservice] {
-+ if { [setup_srvtab 0 gssservice] == 0 } {
- perror "failed to set up gssservice srvtab"
- }
-
- catch "exec rm -f $tmppwd/gss_tk_0 $tmppwd/gss_tk_1 $tmppwd/gss_tk_2 $tmppwd/gss_tk_3"
-
- # Use kinit to get a ticket.
-- if ![our_kinit gsstest0 gsstest0$KEY $tmppwd/gss_tk_0] {
-+ if { [our_kinit gsstest0 gsstest0$KEY $tmppwd/gss_tk_0] == 0 } {
- perror "failed to kinit gsstest0"
- }
-
- # Use kinit to get a ticket.
-- if ![our_kinit gsstest1 gsstest1$KEY $tmppwd/gss_tk_1] {
-+ if { [our_kinit gsstest1 gsstest1$KEY $tmppwd/gss_tk_1] == 0 } {
- perror "failed to kinit gsstest1"
- }
-
- # Use kinit to get a ticket.
-- if ![our_kinit gsstest2 gsstest2$KEY $tmppwd/gss_tk_2] {
-+ if { [our_kinit gsstest2 gsstest2$KEY $tmppwd/gss_tk_2] == 0 } {
- perror "failed to kinit gsstest2"
- }
-
- # Use kinit to get a ticket.
-- if ![our_kinit gsstest3 gsstest3$KEY $tmppwd/gss_tk_3] {
-+ if { [our_kinit gsstest3 gsstest3$KEY $tmppwd/gss_tk_3] == 0 } {
- perror "failed to kinit gsstest3"
- }
-
3  app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4
View
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.1 2012/12/23 01:25:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.7.4,v 1.2 2012/12/24 17:13:25 alonbl Exp $
STARTUP_MODE='save';
@@ -29,6 +29,7 @@ checkconfig() {
start() {
ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
checkconfig || eend $?
+ checkpath -d -m 0775 -o tss /var/run/tpm
start-stop-daemon --start --exec "${command}" -- ${command_args} $STARTUP_MODE > /dev/null
eend $?
}
5 app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild → app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
View
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4.ebuild,v 1.1 2012/12/23 01:25:26 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild,v 1.1 2012/12/24 17:13:25 alonbl Exp $
EAPI=2
inherit user linux-mod cmake-utils udev
@@ -64,9 +64,6 @@ src_install() {
newinitd "${FILESDIR}"/${PN}.initd-0.7.4 ${PN}
newconfd "${FILESDIR}"/${PN}.confd-0.7.4 ${PN}
- keepdir /var/run/tpm
- fowners tss /var/run/tpm
-
keepdir /var/log/tpm
fowners tss:tss /var/log/tpm
}
1  app-emulation/ganeti/Manifest
View
@@ -8,3 +8,4 @@ DIST ganeti-2.5.1.tar.gz 2292928 SHA256 c80ce69e5cee61cff058dbde43a1fa32f020b95a
DIST ganeti-2.5.2.tar.gz 2294366 SHA256 356a50fb847003c05a493888192912a3079de928ec73d9b4c5cb887968d6d6b4 SHA512 58f9b93fd75bcd94dd351cd46754f6516eaaf6d85807a1a26a394f9ba48a73abd13e8355bb3b91c0f7e7a0f4dfd38fc3a1533ccf6b043507a59ea58e8cfe679f WHIRLPOOL 5e76ff14850e2e349211b144bd6a7a8813408bf8eff379a7826814be1bb8ecaaea72da7226d24a9e0ce7a39ee45b93a0fa1500ce083aed289200d8f19311b030
DIST ganeti-2.6.0.tar.gz 2752108 SHA256 015f0e425924ef5ea7db06a198991f95ca8aeea407bee4e7c68ef8cc0591b29e SHA512 bfaa3fbea99ba2b57fab0fe4ef0d909259e289e9cfe126b28b3ac6277d46aa357a27144d189d4f9af57f9683fd9bbab9f7af6376f9724d7f252f9c1236ed8ab0 WHIRLPOOL 46a42135d6b6b887b131c02c7b16f2dfe5fc5241c61d1d13de8f2743622ed313cca59beb424e529baa978c43900b2d11970c5646f7e661fa7b3e9a0718340237
DIST ganeti-2.6.1.tar.gz 2760050 SHA256 bcaefe84f809d5687622a364c8812138639fdcc5f3e40defcdf8926d1fd9107e SHA512 8f140a637fe2be267bf82280eae83b7e7e3deaad3f1dffbc14107defbc5e81b8405fd739fa5a872eab5f6770957f1c8f18eb0845a69a856cf227f9241c4532b9 WHIRLPOOL c88f806f84445752d573ec46ecb24b7cce2c51638901cc41686fd481a1de9edb6b2a382a42d16ad805bb094f5ebfedfc32bbcd34e2aaf62292a14c7c317c4712
+DIST ganeti-2.6.2.tar.gz 2759827 SHA256 d8ee78c52f72a290d76b63430fa42a5d530e5e064cb985d807f5afda5935d932 SHA512 bac669fe4384db58a2c5fcbc4f1e84bfb43d28cef63dcaa5f98a03b1a53e13ad0695e19d5e80702ec7eb23e73e154ed3be522e653a71028653426ea2bb905f53 WHIRLPOOL df0e6092ffa7fe9bf536149f82dd719afd4566539cec2c45bcb57db8b2e0c003cca039cf50d317fdd48ec1ffdbff4f689162f91d31ef1ef72b450100582d4d8d
42 app-emulation/ganeti/files/ganeti-2.6-fix-tests.patch
View
@@ -0,0 +1,42 @@
+diff -ur ganeti-2.6.2/test/cli-test.bash ganeti-2.6.2.new/test/cli-test.bash
+--- ganeti-2.6.2/test/cli-test.bash 2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/cli-test.bash 2012-12-23 22:29:14.886372066 -0800
+@@ -3,6 +3,7 @@
+ export SCRIPTS=${TOP_BUILDDIR:-.}/scripts
+ export DAEMONS=${TOP_BUILDDIR:-.}/daemons
+
+-shelltest $SHELLTESTARGS \
+- ${TOP_SRCDIR:-.}/test/gnt-*.test \
+- -- --hide-successes
++# Skip shelltest until package is in portage
++#shelltest $SHELLTESTARGS \
++# ${TOP_SRCDIR:-.}/test/gnt-*.test \
++# -- --hide-successes
+diff -ur ganeti-2.6.2/test/ganeti.hooks_unittest.py ganeti-2.6.2.new/test/ganeti.hooks_unittest.py
+--- ganeti-2.6.2/test/ganeti.hooks_unittest.py 2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/ganeti.hooks_unittest.py 2012-12-23 22:30:34.902373826 -0800
+@@ -191,7 +191,7 @@
+ os.symlink("/usr/bin/env", fname)
+ self.torm.append((fname, False))
+ env_snt = {"PHASE": phase}
+- env_exp = "PHASE=%s" % phase
++ env_exp = "LD_PRELOAD=libsandbox.so\\nPHASE=%s" % phase
+ self.failUnlessEqual(self.hr.RunHooks(self.hpath, phase, env_snt),
+ [(self._rname(fname), HKR_SUCCESS, env_exp)])
+
+diff -ur ganeti-2.6.2/test/ganeti.utils.process_unittest.py ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py
+--- ganeti-2.6.2/test/ganeti.utils.process_unittest.py 2012-12-21 06:38:52.000000000 -0800
++++ ganeti-2.6.2.new/test/ganeti.utils.process_unittest.py 2012-12-23 22:30:09.278373262 -0800
+@@ -340,10 +340,10 @@
+ def testResetEnv(self):
+ """Test environment reset functionality"""
+ self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True).stdout.strip(),
+- "")
++ "LD_PRELOAD=libsandbox.so")
+ self.failUnlessEqual(utils.RunCmd(["env"], reset_env=True,
+ env={"FOO": "bar",}).stdout.strip(),
+- "FOO=bar")
++ "LD_PRELOAD=libsandbox.so\nFOO=bar")
+
+ def testNoFork(self):
+ """Test that nofork raise an error"""
137 app-emulation/ganeti/ganeti-2.5.2-r2.ebuild
View
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.5.2-r2.ebuild,v 1.1 2012/12/24 07:34:07 ramereth Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit eutils confutils bash-completion-r1 python
+
+MY_PV="${PV/_rc/~rc}"
+#MY_PV="${PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ # you will need to pull in the haskell overlay for pandoc
+ GIT_DEPEND="app-text/pandoc
+ dev-python/docutils
+ dev-python/sphinx
+ media-libs/gd[fontconfig,jpeg,png,truetype]
+ media-gfx/graphviz
+ media-fonts/urw-fonts"
+else
+ SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://code.google.com/p/ganeti/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+ kvm? ( app-emulation/qemu )
+ lxc? ( app-emulation/lxc )
+ drbd? ( >=sys-cluster/drbd-8.3 )
+ ipv6? ( net-misc/ndisc6 )
+ htools? (
+ >=dev-lang/ghc-6.10
+ dev-haskell/json
+ dev-haskell/curl
+ dev-haskell/network
+ dev-haskell/parallel )
+ dev-libs/openssl
+ dev-python/paramiko
+ dev-python/pyopenssl
+ >=dev-python/pyparsing-1.4.6
+ dev-python/pycurl
+ dev-python/pyinotify
+ dev-python/simplejson
+ net-analyzer/arping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ >=dev-lang/python-2.6
+ ${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+
+pkg_setup () {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ ./autogen.sh
+ fi
+ epatch "${FILESDIR}/${PN}-fix-start-stop.patch"
+ epatch "${FILESDIR}/${PN}-2.5-gentoo-start-stop-daemon.patch"
+
+ # Force Ganeti to use python2
+ python_convert_shebangs -r 2 tools
+ python_convert_shebangs 2 daemons/import-export
+}
+
+src_configure () {
+ local myconf
+ if use filestorage ; then
+ myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
+ else
+ myconf="--with-file-storage-dir=no"
+ fi
+ if use sharedstorage ; then
+ myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
+ else
+ myconf="--with-shared-file-storage-dir=no"
+ fi
+ if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
+ myconf="--with-kvm-path=/usr/bin/qemu-kvm"
+ fi
+ econf --localstatedir=/var \
+ --docdir=/usr/share/doc/${P} \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/ganeti/os \
+ $(use_enable syslog) \
+ $(use_enable htools) \
+ $(use_enable htools htools-rapi) \
+ ${myconf}
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
+ newconfd "${FILESDIR}"/ganeti.confd ganeti
+ use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ newbashcomp doc/examples/bash_completion ganeti
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst
+ rm -rf "${D}"/usr/share/doc/ganeti
+ docinto examples
+ #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup}
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ganeti
+ # Force Ganeti to use python2
+ python_convert_shebangs -r 2 "${D}"/usr/sbin/
+ python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
+
+ keepdir /var/{lib,log,run}/ganeti/
+ keepdir /usr/share/ganeti/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+}
160 app-emulation/ganeti/ganeti-2.6.2.ebuild
View
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/ganeti/ganeti-2.6.2.ebuild,v 1.2 2012/12/24 17:52:08 ramereth Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils confutils bash-completion-r1 python
+
+MY_PV="${PV/_rc/~rc}"
+#MY_PV="${PV/_beta/~beta}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.ganeti.org/ganeti.git"
+ inherit git-2
+ KEYWORDS=""
+ # you will need to pull in the haskell overlay for pandoc
+ GIT_DEPEND="app-text/pandoc
+ dev-python/docutils
+ dev-python/sphinx
+ media-libs/gd[fontconfig,jpeg,png,truetype]
+ media-gfx/graphviz
+ media-fonts/urw-fonts"
+else
+ SRC_URI="http://ganeti.googlecode.com/files/${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Ganeti is a virtual server management software tool"
+HOMEPAGE="http://code.google.com/p/ganeti/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="kvm xen lxc drbd +filestorage sharedstorage htools syslog ipv6
+ haskell-daemons rbd test"
+REQUIRED_USE="|| ( kvm xen lxc )"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND="xen? ( >=app-emulation/xen-3.0 )
+ kvm? ( app-emulation/qemu )
+ lxc? ( app-emulation/lxc )
+ drbd? ( >=sys-cluster/drbd-8.3 )
+ rbd? ( sys-cluster/ceph )
+ ipv6? ( net-misc/ndisc6 )
+ htools? (
+ >=dev-lang/ghc-6.10
+ dev-haskell/json
+ dev-haskell/curl
+ dev-haskell/network
+ dev-haskell/parallel )
+ haskell-daemons? (
+ dev-haskell/hslogger
+ dev-haskell/crypto
+ dev-haskell/text
+ dev-haskell/hinotify )
+ dev-libs/openssl
+ dev-python/elementtree
+ dev-python/paramiko
+ dev-python/pyopenssl
+ >=dev-python/pyparsing-1.4.6
+ dev-python/pycurl
+ dev-python/pyinotify
+ dev-python/simplejson
+ net-analyzer/arping
+ net-analyzer/fping
+ net-misc/bridge-utils
+ net-misc/curl[ssl]
+ net-misc/openssh
+ net-misc/socat
+ sys-apps/iproute2
+ sys-fs/lvm2
+ >=sys-apps/baselayout-2.0
+ ${GIT_DEPEND}"
+RDEPEND="${DEPEND}
+ !app-emulation/ganeti-htools"
+DEPEND+=" test? ( || ( dev-lang/python:2.7[ipv6] dev-lang/python:2.6[ipv6] ) )"
+
+pkg_setup () {
+ confutils_use_depend_all haskell-daemons htools
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} == "9999" ]] ; then
+ ./autogen.sh
+ fi
+ epatch "${FILESDIR}/${PN}-2.6-fix-args.patch"
+ epatch "${FILESDIR}/${PN}-2.6-add-pgrep.patch"
+
+ if use !test ; then
+ # Force Ganeti to use python2
+ python_convert_shebangs -r 2 tools
+ python_convert_shebangs 2 daemons/import-export lib/ovf.py
+ fi
+}
+
+src_configure () {
+ local myconf
+ if use filestorage ; then
+ myconf="--with-file-storage-dir=/var/lib/ganeti-storage/file"
+ else
+ myconf="--with-file-storage-dir=no"
+ fi
+ if use sharedstorage ; then
+ myconf="--with-shared-file-storage-dir=/var/lib/ganeti-storage/shared"
+ else
+ myconf="--with-shared-file-storage-dir=no"
+ fi
+ if use kvm && [ -f /usr/bin/qemu-kvm ] ; then
+ myconf="--with-kvm-path=/usr/bin/qemu-kvm"
+ fi
+ if use haskell-daemons ; then
+ myconf="--enable-confd=haskell"
+ fi
+ econf --localstatedir=/var \
+ --docdir=/usr/share/doc/${P} \
+ --with-ssh-initscript=/etc/init.d/sshd \
+ --with-export-dir=/var/lib/ganeti-storage/export \
+ --with-os-search-path=/usr/share/ganeti/os \
+ $(use_enable syslog) \
+ $(use_enable htools) \
+ $(use_enable htools htools-rapi) \
+ ${myconf}
+}
+
+src_install () {
+ emake V=1 DESTDIR="${D}" install || die "emake install failed"
+ newinitd "${FILESDIR}"/ganeti-2.1.initd ganeti
+ newconfd "${FILESDIR}"/ganeti.confd ganeti
+ use kvm && newinitd "${FILESDIR}"/ganeti-kvm-poweroff.initd ganeti-kvm-poweroff
+ use kvm && newconfd "${FILESDIR}"/ganeti-kvm-poweroff.confd ganeti-kvm-poweroff
+ newbashcomp doc/examples/bash_completion ganeti
+ dodoc INSTALL UPGRADE NEWS README doc/*.rst doc/*.png
+ dohtml -r doc/html/*
+ rm -rf "${D}"/usr/share/doc/ganeti
+ docinto examples
+ #dodoc doc/examples/{basic-oob,ganeti.cron,gnt-config-backup}
+ dodoc doc/examples/{ganeti.cron,gnt-config-backup}
+ docinto examples/hooks
+ dodoc doc/examples/hooks/{ipsec,ethers}
+ insinto /etc/cron.d
+ newins doc/examples/ganeti.cron ganeti
+
+ # Force Ganeti to use python2
+ python_convert_shebangs -r 2 "${D}"/usr/sbin/
+ python_convert_shebangs 2 "${D}"/usr/"$(get_libdir)"/ganeti/ensure-dirs
+
+ keepdir /var/{lib,log,run}/ganeti/
+ keepdir /usr/share/ganeti/os/
+ keepdir /var/lib/ganeti-storage/{export,file,shared}/
+}
+
+src_test () {
+ # work around patches to make tests work
+ epatch "${FILESDIR}/${PN}-2.6-fix-tests.patch"
+ emake check || die "emake check failed"
+}
1  app-emulation/hercules/Manifest
View
@@ -2,3 +2,4 @@ DIST hercules-3.04.tar.gz 2079774 SHA256 4512a7c2b86b4a92c337c99761295aa4eaa54e9
DIST hercules-3.05.tar.gz 2470621 SHA256 f190221fa25692c0316be331f618c0675f9f9875c44b8af3efa7a431d138b1e2 SHA512 0ea3e3dfb119f90721df7bddb1bd8d5329f13ca744325454459f7e716ae8859ecc23b5bd61afe9f1ed7426a2cd9d57ce881653620c4c5601781f7ba1f5022321 WHIRLPOOL 089362403fadac9973f2f4312010a03531553cf50beaf1402b0605f903dc01add14c50627c4b08831d1bd7a6dc9e72177114805c106833411c9f58572363021d
DIST hercules-3.06.tar.gz 2658262 SHA256 fa00b17c86a47133108c49973ba343d589f0e8777a115d827ef3da9aafbda22b SHA512 a938c2be64094ca412fb9094942088e344aa67b0af324af674d4fff73c6e936ffc6e384a5edcb48d1c31439c55322bf5e6b2e7ea36e7e7c9e416d8522240b1c5 WHIRLPOOL dbebb54e19ea5016d576153a0818ff5ce8e7114449837f127ad1c0ea82c561306a443dee2bd47d9a8c4afbd6ca257ca350348e773def86eccac76d3c754ea29c
DIST hercules-3.07.tar.gz 2701835 SHA256 02d5f6c66d699d413a4db9ef5a799249a6645ac10f2af1edb37992e7fa1f7724 SHA512 5e4e55e9a11f0b7e78daafe9f219243d298bbdeeaf35f82c862db0c9f0de24f553239d0b76acaf7673cf54d03278193c2f93df3fba410874f95dbf93b5bb0e64 WHIRLPOOL 0b68910dc43fb49ca2e54f2e405f03cc15e86ed7f297fb81ca4f62f8e11077097d019e8d125a66fedd2666e988c017d1b8066a61857dc520b6c6f3c99059b00c
+DIST hercules-3.08.tar.gz 2684844 SHA256 85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d SHA512 6fe8da6e0462f4b27f987c86b2de769e6a1a9eb3389bb612b59931590f75e7dd9d4a8456b5f36209aadf433dfe2e48686f2cda8e95b7480b9bdb971247e1eae5 WHIRLPOOL 833b2ba21a17d70cd3ba9a4f88fdaaec288acf471d43fd9c660e55c7c48f7a34b46b1defd7ffb699ed3f34af1fca9484303a09f3a020fa06367cdd291a675f5b
39 app-emulation/hercules/hercules-3.08.ebuild
View
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/hercules/hercules-3.08.ebuild,v 1.1 2012/12/24 07:35:36 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic
+
+DESCRIPTION="Hercules System/370, ESA/390 and zArchitecture Mainframe Emulator"
+HOMEPAGE="http://www.hercules-390.eu/"
+SRC_URI="http://downloads.hercules-390.eu/${P}.tar.gz"
+
+LICENSE="QPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="bzip2 custom-cflags +suid"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+ sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ use custom-cflags || strip-flags
+ ac_cv_lib_bz2_BZ2_bzBuffToBuffDecompress=$(usex bzip2) \
+ econf \
+ $(use_enable bzip2 cckd-bzip2) \
+ $(use_enable bzip2 het-bzip2) \
+ $(use_enable suid setuid-hercifc) \
+ --enable-custom="Gentoo ${PF}.ebuild" \
+ --disable-optimization
+}
+
+src_install() {
+ default
+ insinto /usr/share/hercules
+ doins hercules.cnf
+ dodoc README.* RELEASE.NOTES
+ dohtml -r html
+}
2  app-misc/tasque/Manifest
View
@@ -1,2 +1,2 @@
DIST tasque-0.1.11.tar.xz 443516 SHA256 c2fa0932a8339aea1fc1faa419a714abd3e471ae40312803d63592f1584451aa SHA512 0f887f9f26bf755bdf03c7da07b98972674169a201d9f65a15b152f327f843dc630599462b4591f2e7c270a49753c31e262690c2a2b8742182bff569029d3ee2 WHIRLPOOL 307659e00e5046bd6dfc9c4cd1b672298ab7889efd25ae17477ed37947cd966cc6850177be2e47c7d8c8c7ccad4de4464188bb878f80daf4ebbc300221208440
-DIST tasque-0.1.9.tar.bz2 478805 SHA256 1749b0c5a60d74f05f36193ff4aaf5b130ed3a47726f0b8e48c712805d1341af SHA512 94d5a003db2c2c134f92849d30c046f7004cd7e5ebf32920ac53ccc91d0b2d5f48c5cb60e0967ea3cb5a8f57411b87080189b23b9fdee7d4a49802533615fe9d WHIRLPOOL 6b3fe8793ae9b0904365554b716867ba3ec8f03d8db9369fde1405ddf2fd4ae7baea6b561af5f13c23168728187a429d4c42d6237819ce41b26dd7bf5b1af15a
+DIST tasque-0.1.12.tar.xz 461576 SHA256 db4d4a822cfa87ce8cf311189e17fa8fbda37e7c943874b6bf62c6a84b2d824d SHA512 441aa1a13d260e59ef07bb75a0b38b43cbcc30737589922ba4e697220fdd0a9bfe9af8c1c2484b6c0d68a4f33cb0f895822cb04e90d6782db66c0f80de50078b WHIRLPOOL 4ea0288712f596b720f38e5b0f20c4e1c43ab6b7cee206b814b2e272fcdd33ddcaf93b4aaafdef82e3fe2e1371176b7599161e1d32a262a4f92ef057bf14b2a3
244 app-misc/tasque/files/tasque-0.1.9-cachetasks.patch
View
@@ -1,244 +0,0 @@
-diff --git a/src/Backends/Sqlite/SqliteBackend.cs b/src/Backends/Sqlite/SqliteBackend.cs
-index 4e7ec7a..417f6b2 100644
---- a/src/Backends/Sqlite/SqliteBackend.cs
-+++ b/src/Backends/Sqlite/SqliteBackend.cs
-@@ -243,10 +243,10 @@ namespace Tasque.Backends.Sqlite
- bool hasValues = false;
-
- string command = "SELECT id FROM Categories";
-- SqliteCommand cmd = db.Connection.CreateCommand();
-- cmd.CommandText = command;
-- SqliteDataReader dataReader = cmd.ExecuteReader();
-- while(dataReader.Read()) {
-+ SqliteCommand cmd = db.Connection.CreateCommand();
-+ cmd.CommandText = command;
-+ SqliteDataReader dataReader = cmd.ExecuteReader();
-+ while(dataReader.Read()) {
- int id = dataReader.GetInt32(0);
- hasValues = true;
-
-@@ -255,10 +255,10 @@ namespace Tasque.Backends.Sqlite
- defaultCategory = newCategory;
- iter = categoryListStore.Append ();
- categoryListStore.SetValue (iter, 0, newCategory);
-- }
--
-- dataReader.Close();
-- cmd.Dispose();
-+ }
-+
-+ dataReader.Close();
-+ cmd.Dispose();
-
- if(!hasValues)
- {
-@@ -286,23 +286,32 @@ namespace Tasque.Backends.Sqlite
- Gtk.TreeIter iter;
- SqliteTask newTask;
- bool hasValues = false;
--
-- string command = "SELECT id FROM Tasks";
-- SqliteCommand cmd = db.Connection.CreateCommand();
-- cmd.CommandText = command;
-- SqliteDataReader dataReader = cmd.ExecuteReader();
-- while(dataReader.Read()) {
-- int id = dataReader.GetInt32(0);
-+
-+ string command = "SELECT id,Category,Name,DueDate,CompletionDate,Priority, State FROM Tasks";
-+ SqliteCommand cmd = db.Connection.CreateCommand();
-+ cmd.CommandText = command;
-+ SqliteDataReader dataReader = cmd.ExecuteReader();
-+ while(dataReader.Read()) {
-+ int id = dataReader.GetInt32(0);
-+ int category = dataReader.GetInt32(1);
-+ string name = dataReader.GetString(2);
-+ int dueDate = dataReader.GetInt32(3);
-+ int completionDate = dataReader.GetInt32(4);
-+ int priority = dataReader.GetInt32(5);
-+ int state = dataReader.GetInt32(6);
-+
- hasValues = true;
--
-- newTask = new SqliteTask(this, id);
-+
-+ newTask = new SqliteTask(this, id, category,
-+ name, dueDate, completionDate,
-+ priority, state);
- iter = taskStore.AppendNode();
- taskStore.SetValue (iter, 0, newTask);
- taskIters [newTask.SqliteId] = iter;
-- }
-+ }
-
-- dataReader.Close();
-- cmd.Dispose();
-+ dataReader.Close();
-+ cmd.Dispose();
-
- if(!hasValues)
- {
-diff --git a/src/Backends/Sqlite/SqliteTask.cs b/src/Backends/Sqlite/SqliteTask.cs
-index a9f5d42..9ede1b1 100644
---- a/src/Backends/Sqlite/SqliteTask.cs
-+++ b/src/Backends/Sqlite/SqliteTask.cs
-@@ -12,22 +12,41 @@ namespace Tasque.Backends.Sqlite
- {
- private SqliteBackend backend;
- private int id;
-+ private int category;
-+ private string name;
-+ private long dueDate;
-+ private long completionDate;
-+ private int priority;
-+ private int state;
-
- public SqliteTask(SqliteBackend backend, string name)
- {
- this.backend = backend;
- Logger.Debug("Creating New Task Object : {0} (id={1})", name, id);
- name = backend.SanitizeText (name);
-+ this.name = name;
-+ this.dueDate = Database.FromDateTime(DateTime.MinValue);
-+ this.completionDate = Database.FromDateTime(DateTime.MinValue);
-+ this.category = 0;
-+ this.priority = (int)(TaskPriority.None);
-+ this.state = (int)TaskState.Active;
- string command = String.Format("INSERT INTO Tasks (Name, DueDate, CompletionDate, Priority, State, Category, ExternalID) values ('{0}','{1}', '{2}','{3}', '{4}', '{5}', '{6}'); SELECT last_insert_rowid();",
-- name, Database.FromDateTime(DateTime.MinValue), Database.FromDateTime(DateTime.MinValue),
-- ((int)(TaskPriority.None)), ((int)TaskState.Active), 0, string.Empty );
-+ name, dueDate, completionDate,
-+ priority, state, category, string.Empty);
- this.id = Convert.ToInt32 (backend.Database.ExecuteScalar (command));
- }
--
-- public SqliteTask (SqliteBackend backend, int id)
-+
-+ public SqliteTask (SqliteBackend backend, int id, int category, string name,
-+ long dueDate, long completionDate, int priority, int state)
- {
- this.backend = backend;
- this.id = id;
-+ this.category = category;
-+ this.name = name;
-+ this.dueDate = dueDate;
-+ this.completionDate = completionDate;
-+ this.priority = priority;
-+ this.state = state;
- }
-
- #region Public Properties
-@@ -44,12 +63,10 @@ namespace Tasque.Backends.Sqlite
-
- public override string Name
- {
-- get {
-- string command = String.Format("SELECT Name FROM Tasks where ID='{0}'", id);
-- return backend.Database.GetSingleString(command);
-- }
-+ get { return this.name; }
- set {
- string name = backend.SanitizeText (value);
-+ this.name = name;
- string command = String.Format("UPDATE Tasks set Name='{0}' where ID='{1}'", name, id);
- backend.Database.ExecuteScalar(command);
- backend.UpdateTask(this);
-@@ -58,12 +75,10 @@ namespace Tasque.Backends.Sqlite
-
- public override DateTime DueDate
- {
-- get {
-- string command = String.Format("SELECT DueDate FROM Tasks where ID='{0}'", id);
-- return backend.Database.GetDateTime(command);
-- }
-+ get { return Database.ToDateTime(this.dueDate); }
- set {
-- string command = String.Format("UPDATE Tasks set DueDate='{0}' where ID='{1}'", Database.FromDateTime(value), id);
-+ this.dueDate = Database.FromDateTime(value);
-+ string command = String.Format("UPDATE Tasks set DueDate='{0}' where ID='{1}'", this.dueDate, id);
- backend.Database.ExecuteScalar(command);
- backend.UpdateTask(this);
- }
-@@ -72,14 +87,12 @@ namespace Tasque.Backends.Sqlite
-
- public override DateTime CompletionDate
- {
-- get {
-- string command = String.Format("SELECT CompletionDate FROM Tasks where ID='{0}'", id);
-- return backend.Database.GetDateTime(command);
-- }
-+ get { return Database.ToDateTime(this.completionDate); }
- set {
-- string command = String.Format("UPDATE Tasks set CompletionDate='{0}' where ID='{1}'", Database.FromDateTime(value), id);
-+ this.completionDate = Database.FromDateTime(value);
-+ string command = String.Format("UPDATE Tasks set CompletionDate='{0}' where ID='{1}'", this.completionDate, id);
- backend.Database.ExecuteScalar(command);
-- backend.UpdateTask(this);
-+ backend.UpdateTask(this);
- }
- }
-
-@@ -96,14 +109,12 @@ namespace Tasque.Backends.Sqlite
-
- public override TaskPriority Priority
- {
-- get {
-- string command = String.Format("SELECT Priority FROM Tasks where ID='{0}'", id);
-- return (TaskPriority)backend.Database.GetSingleInt(command);
-- }
-+ get { return (TaskPriority) this.priority; }
- set {
-- string command = String.Format("UPDATE Tasks set Priority='{0}' where ID='{1}'", ((int)value), id);
-+ this.priority = (int) value;
-+ string command = String.Format("UPDATE Tasks set Priority='{0}' where ID='{1}'", this.priority, id);
- backend.Database.ExecuteScalar(command);
-- backend.UpdateTask(this);
-+ backend.UpdateTask(this);
- }
- }
-
-@@ -127,27 +138,21 @@ namespace Tasque.Backends.Sqlite
-
- public TaskState LocalState
- {
-- get {
-- string command = String.Format("SELECT State FROM Tasks where ID='{0}'", id);
-- return (TaskState)backend.Database.GetSingleInt(command);
-- }
-+ get { return (TaskState) this.state; }
- set {
-- string command = String.Format("UPDATE Tasks set State='{0}' where ID='{1}'", ((int)value), id);
-+ this.state = (int) value;
-+ string command = String.Format("UPDATE Tasks set State='{0}' where ID='{1}'", this.state, id);
- backend.Database.ExecuteScalar(command);
-- backend.UpdateTask(this);
-+ backend.UpdateTask(this);
- }
- }
-
- public override ICategory Category
- {
-- get {
-- string command = String.Format("SELECT Category FROM Tasks where ID='{0}'", id);
-- int catID = backend.Database.GetSingleInt(command);
-- SqliteCategory sqCat = new SqliteCategory(backend, catID);
-- return sqCat;
-- }
-+ get { return new SqliteCategory(backend, this.category); }
- set {
-- string command = String.Format("UPDATE Tasks set Category='{0}' where ID='{1}'", ((int)(value as SqliteCategory).ID), id);
-+ this.category = (int)(value as SqliteCategory).ID;
-+ string command = String.Format("UPDATE Tasks set Category='{0}' where ID='{1}'", category, id);
- backend.Database.ExecuteScalar(command);
- backend.UpdateTask(this);
- }
-@@ -166,7 +171,7 @@ namespace Tasque.Backends.Sqlite
- int taskId = dataReader.GetInt32(0);
- string text = dataReader.GetString(1);
- notes.Add (new SqliteNote (taskId, text));
-- }
-+ }
-
- return notes;
- }
---
-cgit v0.9.0.2
53 app-misc/tasque/tasque-0.1.12.ebuild
View
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tasque/tasque-0.1.12.ebuild,v 1.1 2012/12/24 13:08:26 pacho Exp $
+
+EAPI=5
+inherit eutils gnome.org mono
+
+DESCRIPTION="Simple task management app (TODO list) for the Linux Desktop"
+HOMEPAGE="https://live.gnome.org/Tasque"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+rememberthemilk +sqlite hiveminder debug"
+
+LANGS="ca ca@valencia cs da de el en_GB eo es et fi fr gl hu id it ja lv nb nds nl pl
+ pt pt_BR ro ru sl sr sr@latin sv th tr zh_CN zh_TW"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+REQUIRED_USE="|| ( rememberthemilk sqlite hiveminder )"
+
+RDEPEND=">=dev-dotnet/gtk-sharp-2.12.7-r5
+ >=dev-dotnet/notify-sharp-0.4.0_pre20080912
+ dev-dotnet/dbus-sharp
+ dev-dotnet/dbus-sharp-glib
+ sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ econf --disable-backend-icecore \
+ --disable-backend-eds \
+ --disable-appindicator \
+ --enable-backend-rtm \
+ $(use_enable sqlite backend-sqlite) \
+ $(use_enable hiveminder backend-hiveminder) \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+ mv_command="cp -pPR" mono_multilib_comply
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+ done
+}
66 app-misc/tasque/tasque-0.1.9.ebuild
View
@@ -1,66 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tasque/tasque-0.1.9.ebuild,v 1.5 2012/05/29 18:50:55 suka Exp $
-
-EAPI="3"
-
-inherit eutils gnome.org mono
-
-DESCRIPTION="Tasky is a simple task management app (TODO list) for the Linux Desktop"
-HOMEPAGE="http://live.gnome.org/Tasque"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+rememberthemilk +sqlite hiveminder debug"
-
-RDEPEND=">=dev-dotnet/gtk-sharp-2.12.7-r5
- >=dev-dotnet/gnome-sharp-2.24.0
- >=dev-dotnet/notify-sharp-0.4.0_pre20080912
- >=dev-dotnet/ndesk-dbus-0.6
- >=dev-dotnet/ndesk-dbus-glib-0.4
- sqlite? ( dev-db/sqlite:3 )
- "
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
- BACKEND=false
- for usef in sqlite hiveminder rememberthemilk
- do
- use $usef && BACKEND=true
- done
- if [[ "${BACKEND}" != "true" ]]
- then
- eerror "You must select one of the following backends by enabling their useflag:"
- eerror "sqlite ( uses a local, file-backed database to keep track of your TODO list )"
- eerror "rememberthemilk ( integrates with www.rememberthemilk.com )"
- eerror "hiveminder ( integrates with www.hiveminder.com )"
- die "Please select a backend"
- fi
-}
-
-src_prepare() {
-
- # upstream patch to increase performance, in next release
- epatch "${FILESDIR}/${P}-cachetasks.patch"
-
-}
-
-src_configure() {
- #http://bugzilla.gnome.org/show_bug.cgi?id=568910
- export GTK_DOTNET_20_LIBS=" " \
- GTK_DOTNET_20_CFLAGS=" "
- econf --disable-backend-icecore \
- --disable-backend-eds \
- --enable-backend-rtm \
- $(use_enable sqlite backend-sqlite) \
- $(use_enable hiveminder backend-hiveminder) \
- $(use_enable debug)
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "emake failed"
- dodoc NEWS TODO README AUTHORS || die "docs installation failed"
- mv_command="cp -pPR" mono_multilib_comply
-}
3  app-misc/tomboy/Manifest
View
@@ -1,3 +1,2 @@
DIST tomboy-1.10.1.tar.xz 6619804 SHA256 85bc277b278fe6aaa38fc0ec8b1777804ea0de647111a5065d43614d1ad10077 SHA512 c917bc48d073c9368350ead2f1c81b349421aacb08c0d17b8e6475c753f4ec35f6e53f4c44a4cdfc53e4378d0d9743fba2d96f37bd45d8c711d8319858c3ff8f WHIRLPOOL 2e3b0446c688df1d88212c6b333657d8417798c9fa4d3de8f44dc3508725b96b7ca4559c9f790e93e18b314e73d8c5db53a63c926af2c09d96c953b70bbd68a3
-DIST tomboy-1.12.1.tar.xz 6671404 SHA256 bd73408752e5b97899d3665881f25e0c8959d994191d713661e80002cd8ce2b6 SHA512 6db144350ca820233ec98c6e98395483a76f95848d7afc0bb02c666f2637805c2e364b6822bdb26cae8ef93a8baa1c6e8acf78f1718ff6a4adf66cb428e23642 WHIRLPOOL 4c73396955b697d77217fd6bef41b66a9369ffb7b4cb9eb795399a0ba18aac65b02ee2aa1c4d9c7d029cbfc2616a46a5bfd79b5f687d36206178269b22340674
-DIST tomboy-1.8.3.tar.xz 6567280 SHA256 3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea SHA512 f6fbc13dd523ddbbde84530c304675bb56a615cfb1d13c07c3a434be9d10b62c08bc21ab678e08f682a1b150d50efaa46bff1b23885d61224a593f9377212af2 WHIRLPOOL 20bfbd85897f1cc974a21c0db0171ccce86dc35f6e9d45597f4ca415fbad17f41e3d6dd2022bf2cf2240521390b8c7267698788ee4856c679461455ab36e0dcb
+DIST tomboy-1.12.2.tar.xz 6671548 SHA256 ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e SHA512 f1b64faaa35d77628a3359bf4c255e3d256b5e67677c6333336db22082c12052b32ea66e8ffaf9268a1a6a9c3c872befdc955ae9889108f433cf1e7e4b199394 WHIRLPOOL 9f43cef1dc2ab2649e817d95dc08e853c45535844887ee935985ec37a57d709229d90577baa2df4f3494a3c9e7ce2b70083e77f43ef0511e50cde75be0d72011
7 app-misc/tomboy/tomboy-1.12.1.ebuild → app-misc/tomboy/tomboy-1.12.2.ebuild
View
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.12.1.ebuild,v 1.1 2012/10/20 07:19:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.12.2.ebuild,v 1.1 2012/12/24 13:15:38 pacho Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -23,7 +23,7 @@ RDEPEND="app-text/gtkspell:2
dev-dotnet/dbus-sharp
dev-dotnet/dbus-sharp-glib
dev-lang/mono
- dev-libs/atk
+ dev-libs/atk:=
gnome-base/gconf:2
x11-libs/gtk+:2
eds? ( dev-libs/gmime:2.6[mono] )"
@@ -41,7 +41,6 @@ src_prepare() {
$(use_enable test tests)
--disable-galago
--disable-update-mimedb"
- DOCS="AUTHORS ChangeLog NEWS README"
# Force gmime-2.6 usage, upstream bug #686510
epatch "${FILESDIR}/${PN}-1.12.1-force-gmime26.patch"
53 app-misc/tomboy/tomboy-1.8.3.ebuild
View
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.8.3.ebuild,v 1.6 2012/08/18 12:22:16 xmw Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 mono
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://projects.gnome.org/tomboy/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="eds test"
-# galago support dropped due upstream bug #660244
-
-RDEPEND="app-text/gtkspell:2
- dev-dotnet/gconf-sharp:2
- dev-dotnet/gtk-sharp:2
- dev-dotnet/mono-addins[gtk]
- dev-dotnet/dbus-sharp
- dev-dotnet/dbus-sharp-glib
- dev-lang/mono
- dev-libs/atk
- gnome-base/gconf:2
- x11-libs/gtk+:2
- eds? ( dev-libs/gmime:2.4[mono] )"
-# galago? ( dev-dotnet/galago-sharp )"
-DEPEND="${RDEPEND}
- app-text/gnome-doc-utils
- app-text/rarian
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-panel-applet
- $(use_enable eds evolution)
- $(use_enable test tests)
- --disable-galago
- --disable-update-mimedb"
- # $(use_enable galago)
- DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_compile() {
- # Not parallel build safe due upstream bug #631546
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
-}
9 app-misc/uptimed/files/uptimed.init
View
@@ -1,12 +1,13 @@
#!/sbin/runscript
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.5 2012/12/19 00:31:18 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/uptimed/files/uptimed.init,v 1.7 2012/12/24 10:07:16 polynomial-c Exp $
+description="uptimed - a daemon to record uptime records"
pidfile="/var/run/uptimed/uptimed.pid"
command="/usr/sbin/uptimed"
command_args="-p ${pidfile}"
-start_stop_daemon_args="--user uptimed"
+start_stop_daemon_args="-u uptimed"
start_pre() {
checkpath -d -o uptimed ${pidfile%/*}
@@ -15,4 +16,8 @@ start_pre() {
start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \
-- -b \
|| eend $?
+
+ # Workaround so openrc doesn't see the service as crashed after start
+ # (bug #448382).
+ mark_service_stopped
}