Update to 1.4.2:

VERSION 1.4.2:
  FEATURES:
    * Handle itpc:// and pcast:// url protocols for adding podcast feeds.
      (BR 128918)
    * New DCOP call "collection: totalComposers" returns the number of
      different composers in your collection.
    * Synchronize playlists to media devices.
    * Support for MTP/PlaysForSure media devices. (BR 128532)
    * iPod plugin usable with iTunes phones. (BR 131487)
    * Browse collection by composer. (BR 122452)
    * New DCOP call "playlist: filenames" returns the filenames of the songs
      currently in the playlist. Patch by Arash Abedinzadeh
    * Lyrics can be edited directly on Context Browser's Lyrics tab.
    * Collection browse mode similar to that used by some portable players.
      Patch by Joe Rabinoff (BR 130586)
    * BPM field. Patch by Alf B Lervåg and Aaron
      VonderHaar (BR 123142)
    * Improved crossfading for xine-engine: Honours the 'Crossfade Length'
      setting precisely, and uses a better mixing style profile. Patch by
      Enrico Ros
    * Media and collection browser tabs now support dropping.
    * Allow for deleting all the tracks on a playlist from iPods. (BR 127855)
    * Ability to create custom last.fm station from the GUI.
    * Ability to mark podcasts as listened.
    * Show error messages when connecting to last.fm streams fails.
    * A new media device implements a DAAP client. So Amarok can connect
      to iTunes, Firefly Media Server etc. (BR 100513)
    * Dynamic Collection: improved support for songs on removable external
      harddisks, SMB and NFS shares

  CHANGES:
    * Skip tracks that failed to transfer to media devices instead of stopping
      transfer process. (BR 130008)
    * libtunepimp 0.5.0 actually compiles successfully now.
    * Lift size limit on pathnames and comments in collection databases not
      managed by MySQL. (BR 130585)
    * Generic mediadevice plugin is improved. Users can configure supported
      filetypes and get more control over the location of songs and podcasts
      on disk (Patch by eute).
    * Move composer tag to its own database table.
    * Re-enable adding videos to iPods with recent libgpod-cvs. (BR 130117)
    * Include Skip, Love and Ban in playlist right-click menu for last.fm
      streams.
    * Advanced Tag Features (ATF) deferred to 1.4.3: Public release delayed
      pending some bug fixes in both Amarok and a dependency. It will be
      automatically disabled the first time you run 1.4.2 if you had it enabled
      from 1.4.2-beta1. (It will still be available in subversion snapshots.)
    * Optionally finish transferring all queued tracks to media device after
      pressing disconnect button. (BR 129716)
    * It's now possible to edit scores and ratings for multiple tracks in
      TagDialog.
    * TagDialog won't make Amarok unresponsive while committing tags changes
      to files anymore.
    * Exact playtime as tooltip in statusbar. Patch by Markus Kaufhold
      (BR 130463)
    * Suspend collection rescanning while organizing files. (BR 129885)
    * Always use metadata from original file for transcoded files transfered
      to media devices. (BR 131171)
    * Enhancements to ATF/statistics to allow for better tracking of stats as
      files are moved.
    * Tag Editing Dialog is now ATF-enabled.
    * In-line tag editing is now ATF-enabled.
    * Previously, using ATF with MP3 files would wipe out existing UFID frames
      from other applications. Now Amarok plays nicely and only touches its
      own UFID frame.
    * ATF no longer requires a restart to enable or disable it.
    * ATF read-only functions are always enabled if a UID is found in the
      file. Option in the configuration dialog now only controls whether new
      UIDs are written to new files.
    * ATF will now automatically run the rescan and clear the Playlist only on
      the first time it is enabled.  After that it will simply display an info
      reminding users that they may need a rescan if their library has changed
      since the last time it was enabled.

  BUGFIXES:
    * DCOP calls to add and remove ATF tags are no longer allowed to run while
      the collection is being scanned.
    * Last.fm streams no longer freeze Amarok's GUI with xine-engine.
    * Sometimes metadata wasn't updated with Last.fm streams.
    * Update context browser on score and rating changes. (BR 132496)
    * Double colons in the collection filter would lead to invalid queries.
      (BR 132551)
    * Handle changed semantics of MySQL 5.0.23+ (BR 132114)
    * Do not try to detach() KURLs, as this would not work for non-ascii urls.
      (BR 132355)
    * Adding songs while at end of playlist could crash in dynamic mode.
      Patch by Joe Rabinoff (BR 128340)
    * Don't update accessdate when setting songs rating or score. (BR 132274)
    * Increasing or decreasing volume while muted would not correctly unmute.
      (BR 132228)
    * Better resize behavior in iPod collection view mode. Patch by Joe Rabinoff
      (BR 132016)
    * Make sure a track's compilation status is returned properly when running
      with Postgresql.
    * Check directory structure on iPods of unknown type in order to detect
      iTunes phones. (BR 131910)
    * Make 'Clear' individually translatable for playlists. (BR 131521)
    * Retain column visibility for flat collection view. (BR 126685)
    * Honour proxy exceptions for MusicBrainz lookups. Patch by N. Cat
      (BR 131377)
    * Correctly pass links containing parentheses to external browsers. Patch
      by Thomas Lindroth (BR 131307)
    * iPods would not show podcast descriptions. (BR 129824)
    * Carry over rounding increments to next larger unit for fuzzy time
      display. (BR 131383)
    * If disabled, don't show splash screen - even on Kubuntu. (BR 125210)
    * Correctly request last.fm similar artist information for artists
      containing non-ASCII characters. Patch by Thomas Lindroth
      (BR 131254)
    * Support non-chronologically ordered podcast feeds. (BR 119911)
    * Support for libvisual 0.4.0 was fixed. Patch by Dennis Smit.
    * Adding songs already on a media device to playlists would not work.
    * Fix adding smart playlists to media devices. (BR 130540)
    * Reverse check for mount point and device node when connecting to iPods
      for better handling of device nodes pointed to by symlinks. (BR 129965)
    * Make handling of filenames on iPods case-insensitive and thus fix
      fix problems with too many orphaned and stale items. (BR 126431)
    * Correct action of queueing current item in dynamic mode. (BR 130313)
    * Double clicking in the filebrowser will append to playlist. (BR 117465)
    * Fixed problems with last.fm streams containing spaces, e.g. "Hip Hop".
    * When generic media devices were specified manually, transferred files
      would not always get converted to vfat-friendly names if they were on a
      vfat filesystem.
    * When using ATF, tags in MP3 files would be written as ID3v2 only and
      existing ID3v1 tags would be stripped, which could lead to media devices
      and tagging libraries that were not ID3v2.4-aware to report that no tag
      existed.  Now both tags are written with identical data.
    * Correct handling of filenames with special characters. (BR 132243)

3 files changed, 90 insertions, 15 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 04eae2ba22b..7b2c78908e3 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2006/07/18 06:37:50 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/08/24 17:37:23 wiz Exp $
 
-DISTNAME=		amarok-1.4.1
-PKGREVISION=		1
+DISTNAME=		amarok-1.4.2
 CATEGORIES=		audio kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
+MASTER_SITES=		${MASTER_SITE_KDE:=amarok/1.4.2/src/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
@@ -40,6 +39,7 @@ PYTHON_PATCH_SCRIPTS= \
 	amarok/src/scripts/webcontrol/WebPublisher.py
 REPLACE_RUBY= \
 	amarok/src/amarok_proxy.rb \
+	amarok/src/mediadevice/daap/amarok_daapserver.rb \
 	amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb \
 	amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb \
 	amarok/src/scripts/ruby_debug/debug.rb \
@@ -54,7 +54,7 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.4
 
 .include "options.mk"
 
-.include "../../audio/libtunepimp0.4/buildlink3.mk"
+.include "../../audio/libtunepimp/buildlink3.mk"
 .include "../../audio/libvisual/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index cfc629da88d..a32ba90d5ab 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,12 +1,17 @@
-@comment $NetBSD: PLIST,v 1.17 2006/07/04 06:45:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/08/24 17:37:23 wiz Exp $
 bin/amarok
+bin/amarok_daapserver.rb
 bin/amarok_libvisual
 bin/amarok_proxy.rb
 bin/amarok_xmmswrapper2
 bin/amarokapp
 bin/amarokcollectionscanner
 lib/kde3/konqsidebar_universalamarok.la
+lib/kde3/libamarok_daap-mediadevice.la
 lib/kde3/libamarok_generic-mediadevice.la
+lib/kde3/libamarok_massstorage-device.la
+lib/kde3/libamarok_nfs-device.la
+lib/kde3/libamarok_smb-device.la
 lib/kde3/libamarok_void-engine_plugin.la
 lib/kde3/libamarok_xine-engine.la
 lib/libamarok.la
@@ -107,7 +112,10 @@ share/doc/kde/HTML/en/amarok/tab_music.png
 share/doc/kde/HTML/en/amarok/tab_wiki.png
 share/doc/kde/HTML/en/amarok/using.docbook
 share/doc/kde/HTML/en/amarok/vis_window.png
+share/doc/kde/HTML/es/amarok/add_dynamic.png
+share/doc/kde/HTML/es/amarok/amarok_playlist.png
 share/doc/kde/HTML/es/amarok/analyzer.png
+share/doc/kde/HTML/es/amarok/browser_choice.png
 share/doc/kde/HTML/es/amarok/buttons.png
 share/doc/kde/HTML/es/amarok/collection.png
 share/doc/kde/HTML/es/amarok/config_appearance.png
@@ -119,8 +127,10 @@ share/doc/kde/HTML/es/amarok/config_playback.png
 share/doc/kde/HTML/es/amarok/config_scrobbler.png
 share/doc/kde/HTML/es/amarok/context.png
 share/doc/kde/HTML/es/amarok/coverman.png
+share/doc/kde/HTML/es/amarok/dynamic_bar.png
 share/doc/kde/HTML/es/amarok/dynamic_mode1.png
 share/doc/kde/HTML/es/amarok/dynamic_mode2.png
+share/doc/kde/HTML/es/amarok/dynamic_settings.png
 share/doc/kde/HTML/es/amarok/equalizer.png
 share/doc/kde/HTML/es/amarok/file_browser.png
 share/doc/kde/HTML/es/amarok/logo.png
@@ -131,12 +141,16 @@ share/doc/kde/HTML/es/amarok/pl_browser.png
 share/doc/kde/HTML/es/amarok/pl_tip1.png
 share/doc/kde/HTML/es/amarok/play_list.png
 share/doc/kde/HTML/es/amarok/player_window.png
+share/doc/kde/HTML/es/amarok/playlist_browser.png
 share/doc/kde/HTML/es/amarok/playlist_window.png
 share/doc/kde/HTML/es/amarok/queue_manager.png
 share/doc/kde/HTML/es/amarok/quick.docbook
 share/doc/kde/HTML/es/amarok/rmb_menu.png
 share/doc/kde/HTML/es/amarok/script_manager.png
 share/doc/kde/HTML/es/amarok/status_bar.png
+share/doc/kde/HTML/es/amarok/tab_lyrics.png
+share/doc/kde/HTML/es/amarok/tab_music.png
+share/doc/kde/HTML/es/amarok/tab_wiki.png
 share/doc/kde/HTML/es/amarok/vis_window.png
 share/doc/kde/HTML/et/amarok/advanced.docbook
 share/doc/kde/HTML/et/amarok/common
@@ -197,6 +211,7 @@ share/doc/kde/HTML/it/amarok/pl_tip1.png
 share/doc/kde/HTML/it/amarok/play_list.png
 share/doc/kde/HTML/it/amarok/player_window.png
 share/doc/kde/HTML/it/amarok/playlist_browser.png
+share/doc/kde/HTML/it/amarok/playlist_window.png
 share/doc/kde/HTML/it/amarok/plugin.docbook
 share/doc/kde/HTML/it/amarok/queue_manager.png
 share/doc/kde/HTML/it/amarok/quick.docbook
@@ -204,9 +219,14 @@ share/doc/kde/HTML/it/amarok/requirements.docbook
 share/doc/kde/HTML/it/amarok/rmb_menu.png
 share/doc/kde/HTML/it/amarok/script_manager.png
 share/doc/kde/HTML/it/amarok/status_bar.png
+share/doc/kde/HTML/it/amarok/tab_lyrics.png
+share/doc/kde/HTML/it/amarok/tab_music.png
+share/doc/kde/HTML/it/amarok/tab_wiki.png
 share/doc/kde/HTML/it/amarok/using.docbook
 share/doc/kde/HTML/it/amarok/vis_window.png
+share/doc/kde/HTML/nl/amarok/add_dynamic.png
 share/doc/kde/HTML/nl/amarok/advanced.docbook
+share/doc/kde/HTML/nl/amarok/amarok_playlist.png
 share/doc/kde/HTML/nl/amarok/analyzer.png
 share/doc/kde/HTML/nl/amarok/buttons.png
 share/doc/kde/HTML/nl/amarok/collection.png
@@ -214,9 +234,7 @@ share/doc/kde/HTML/nl/amarok/common
 share/doc/kde/HTML/nl/amarok/config.docbook
 share/doc/kde/HTML/nl/amarok/config_appearance.png
 share/doc/kde/HTML/nl/amarok/config_collection.png
-share/doc/kde/HTML/nl/amarok/config_colors.png
 share/doc/kde/HTML/nl/amarok/config_engine.png
-share/doc/kde/HTML/nl/amarok/config_fonts.png
 share/doc/kde/HTML/nl/amarok/config_general.png
 share/doc/kde/HTML/nl/amarok/config_osd.png
 share/doc/kde/HTML/nl/amarok/config_playback.png
@@ -224,6 +242,7 @@ share/doc/kde/HTML/nl/amarok/config_scrobbler.png
 share/doc/kde/HTML/nl/amarok/context.png
 share/doc/kde/HTML/nl/amarok/coverman.png
 share/doc/kde/HTML/nl/amarok/develop.docbook
+share/doc/kde/HTML/nl/amarok/dynamic_bar.png
 share/doc/kde/HTML/nl/amarok/equalizer.png
 share/doc/kde/HTML/nl/amarok/faq.docbook
 share/doc/kde/HTML/nl/amarok/feature_guide.docbook
@@ -237,28 +256,74 @@ share/doc/kde/HTML/nl/amarok/pl_browser.png
 share/doc/kde/HTML/nl/amarok/pl_tip1.png
 share/doc/kde/HTML/nl/amarok/play_list.png
 share/doc/kde/HTML/nl/amarok/player_window.png
+share/doc/kde/HTML/nl/amarok/playlist_browser.png
 share/doc/kde/HTML/nl/amarok/playlist_window.png
 share/doc/kde/HTML/nl/amarok/plugin.docbook
+share/doc/kde/HTML/nl/amarok/queue_manager.png
 share/doc/kde/HTML/nl/amarok/quick.docbook
 share/doc/kde/HTML/nl/amarok/requirements.docbook
 share/doc/kde/HTML/nl/amarok/rmb_menu.png
-share/doc/kde/HTML/nl/amarok/search.png
+share/doc/kde/HTML/nl/amarok/script_manager.png
 share/doc/kde/HTML/nl/amarok/status_bar.png
+share/doc/kde/HTML/nl/amarok/tab_lyrics.png
+share/doc/kde/HTML/nl/amarok/tab_lyrics1.png
+share/doc/kde/HTML/nl/amarok/tab_music.png
+share/doc/kde/HTML/nl/amarok/tab_wiki.png
 share/doc/kde/HTML/nl/amarok/using.docbook
 share/doc/kde/HTML/nl/amarok/vis_window.png
+share/doc/kde/HTML/pl/amarok/advanced.docbook
+share/doc/kde/HTML/pl/amarok/common
+share/doc/kde/HTML/pl/amarok/config.docbook
+share/doc/kde/HTML/pl/amarok/faq.docbook
+share/doc/kde/HTML/pl/amarok/index.cache.bz2
+share/doc/kde/HTML/pl/amarok/index.docbook
+share/doc/kde/HTML/pl/amarok/quick.docbook
+share/doc/kde/HTML/pl/amarok/requirements.docbook
+share/doc/kde/HTML/pl/amarok/using.docbook
+share/doc/kde/HTML/pt/amarok/add_dynamic.png
 share/doc/kde/HTML/pt/amarok/advanced.docbook
+share/doc/kde/HTML/pt/amarok/amarok_playlist.png
+share/doc/kde/HTML/pt/amarok/analyzer.png
+share/doc/kde/HTML/pt/amarok/buttons.png
+share/doc/kde/HTML/pt/amarok/collection.png
 share/doc/kde/HTML/pt/amarok/common
 share/doc/kde/HTML/pt/amarok/config.docbook
+share/doc/kde/HTML/pt/amarok/config_appearance.png
+share/doc/kde/HTML/pt/amarok/config_collection.png
+share/doc/kde/HTML/pt/amarok/config_engine.png
+share/doc/kde/HTML/pt/amarok/config_general.png
+share/doc/kde/HTML/pt/amarok/config_osd.png
+share/doc/kde/HTML/pt/amarok/config_playback.png
+share/doc/kde/HTML/pt/amarok/config_scrobbler.png
+share/doc/kde/HTML/pt/amarok/coverman.png
 share/doc/kde/HTML/pt/amarok/develop.docbook
+share/doc/kde/HTML/pt/amarok/dynamic_bar.png
+share/doc/kde/HTML/pt/amarok/dynamic_settings.png
+share/doc/kde/HTML/pt/amarok/equalizer.png
 share/doc/kde/HTML/pt/amarok/faq.docbook
 share/doc/kde/HTML/pt/amarok/feature_guide.docbook
+share/doc/kde/HTML/pt/amarok/file_browser.png
 share/doc/kde/HTML/pt/amarok/hidden.docbook
 share/doc/kde/HTML/pt/amarok/index.cache.bz2
 share/doc/kde/HTML/pt/amarok/index.docbook
+share/doc/kde/HTML/pt/amarok/logo.png
+share/doc/kde/HTML/pt/amarok/media_device.png
+share/doc/kde/HTML/pt/amarok/menubar.png
+share/doc/kde/HTML/pt/amarok/musicbrainz.png
+share/doc/kde/HTML/pt/amarok/pl_tip1.png
+share/doc/kde/HTML/pt/amarok/play_list.png
+share/doc/kde/HTML/pt/amarok/player_window.png
+share/doc/kde/HTML/pt/amarok/playlist_browser.png
+share/doc/kde/HTML/pt/amarok/playlist_window.png
 share/doc/kde/HTML/pt/amarok/plugin.docbook
+share/doc/kde/HTML/pt/amarok/queue_manager.png
 share/doc/kde/HTML/pt/amarok/quick.docbook
 share/doc/kde/HTML/pt/amarok/requirements.docbook
+share/doc/kde/HTML/pt/amarok/rmb_menu.png
+share/doc/kde/HTML/pt/amarok/script_manager.png
+share/doc/kde/HTML/pt/amarok/status_bar.png
 share/doc/kde/HTML/pt/amarok/using.docbook
+share/doc/kde/HTML/pt/amarok/vis_window.png
 share/doc/kde/HTML/pt_BR/amarok/advanced.docbook
 share/doc/kde/HTML/pt_BR/amarok/common
 share/doc/kde/HTML/pt_BR/amarok/config.docbook
@@ -740,7 +805,6 @@ share/kde/apps/amarok/images/eq_inactive2.png
 share/kde/apps/amarok/images/lastfm.png
 share/kde/apps/amarok/images/loading1.png
 share/kde/apps/amarok/images/loading2.png
-share/kde/apps/amarok/images/logo_web.png
 share/kde/apps/amarok/images/menu_sidepixmap.png
 share/kde/apps/amarok/images/more_albums.png
 share/kde/apps/amarok/images/musicbrainz.png
@@ -762,6 +826,7 @@ share/kde/apps/amarok/images/volumeslider-inset.png
 share/kde/apps/amarok/images/wizard_compact.png
 share/kde/apps/amarok/images/wizard_xmms.png
 share/kde/apps/amarok/images/xine_logo.png
+share/kde/apps/amarok/ruby_lib/codes.rb
 share/kde/apps/amarok/scripts/common/Publisher.py
 share/kde/apps/amarok/scripts/common/Zeroconf.py
 share/kde/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -826,12 +891,19 @@ share/kde/icons/hicolor/22x22/apps/amarok.png
 share/kde/icons/hicolor/32x32/apps/amarok.png
 share/kde/icons/hicolor/48x48/apps/amarok.png
 share/kde/icons/hicolor/64x64/apps/amarok.png
+share/kde/services/amarok_daap-mediadevice.desktop
 share/kde/services/amarok_generic-mediadevice.desktop
+share/kde/services/amarok_massstorage-device.desktop
+share/kde/services/amarok_nfs-device.desktop
+share/kde/services/amarok_smb-device.desktop
 share/kde/services/amarok_void-engine_plugin.desktop
 share/kde/services/amarok_xine-engine.desktop
-share/kde/services/lastfm.protocol
+share/kde/services/amarokitpc.protocol
+share/kde/services/amaroklastfm.protocol
+share/kde/services/amarokpcast.protocol
 share/kde/servicetypes/amarok_codecinstall.desktop
 share/kde/servicetypes/amarok_plugin.desktop
+share/locale/af/LC_MESSAGES/amarok.mo
 share/locale/az/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
 share/locale/br/LC_MESSAGES/amarok.mo
@@ -911,6 +983,7 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @dirrm share/kde/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/kde/apps/amarok/scripts/common
 @dirrm share/kde/apps/amarok/scripts
+@dirrm share/kde/apps/amarok/ruby_lib
 @dirrm share/kde/apps/amarok/images
 @dirrm share/kde/apps/amarok/icons/hicolor/64x64/actions
 @dirrm share/kde/apps/amarok/icons/hicolor/64x64
@@ -942,6 +1015,8 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @comment in kde: @dirrm share/doc/kde/HTML/pt_BR
 @dirrm share/doc/kde/HTML/pt/amarok
 @comment in kde: @dirrm share/doc/kde/HTML/pt
+@dirrm share/doc/kde/HTML/pl/amarok
+@comment in kde: @dirrm share/doc/kde/HTML/pl
 @dirrm share/doc/kde/HTML/nl/amarok
 @comment in kde: @dirrm share/doc/kde/HTML/nl
 @dirrm share/doc/kde/HTML/it/amarok
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index faeb46a3e58..a52711af2a7 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2006/07/24 13:58:11 joerg Exp $
+$NetBSD: distinfo,v 1.22 2006/08/24 17:37:23 wiz Exp $
 
-SHA1 (amarok-1.4.1.tar.bz2) = ecabf7fd15ac45d29ccd1b9309f093ecda8acfab
-RMD160 (amarok-1.4.1.tar.bz2) = d9df29c2a2a7b81aabb73c66b83190f0bc109094
-Size (amarok-1.4.1.tar.bz2) = 13509939 bytes
+SHA1 (amarok-1.4.2.tar.bz2) = b1ddd12e5ef2cee0b4e41063a18c4520733469e7
+RMD160 (amarok-1.4.2.tar.bz2) = abc1f6bef1962fc5b1fee18f3716e4c57a59a7b4
+Size (amarok-1.4.2.tar.bz2) = 17080668 bytes
 SHA1 (patch-aa) = 32ae1ed331a36951739651f380363b71cc0b04e8
 SHA1 (patch-ab) = a36c9ca68810c71a95857249b63ff19d4b3f3fbb