From 2fa10170fa0c72489eb544d773984c1752ec0609 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 3 May 2014 11:52:34 -0300 Subject: p7zip-libre-9.20.1-9.3: optimized removing source and patching package --- libre/p7zip-libre/9.04-makefile.patch | 19 - libre/p7zip-libre/PKGBUILD | 36 +- libre/p7zip-libre/libre.patch | 170 + libre/p7zip-libre/p7zip-libre.patch | 6540 ---------------------------- libre/p7zip-libre/parent-folder-icon.patch | 33 - 5 files changed, 189 insertions(+), 6609 deletions(-) delete mode 100644 libre/p7zip-libre/9.04-makefile.patch create mode 100644 libre/p7zip-libre/libre.patch delete mode 100644 libre/p7zip-libre/p7zip-libre.patch delete mode 100644 libre/p7zip-libre/parent-folder-icon.patch (limited to 'libre/p7zip-libre') diff --git a/libre/p7zip-libre/9.04-makefile.patch b/libre/p7zip-libre/9.04-makefile.patch deleted file mode 100644 index 93a99cc90..000000000 --- a/libre/p7zip-libre/9.04-makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile.orig 2010-01-04 13:58:54.527887746 +0100 -+++ p7zip_9.04/CPP/7zip/Bundles/Format7zFree/makefile 2010-01-04 13:59:10.290868343 +0100 -@@ -247,8 +247,6 @@ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -@@ -298,7 +296,6 @@ - $(HFS_OBJS) \ - $(ISO_OBJS) \ - $(NSIS_OBJS) \ -- $(RAR_OBJS) \ - $(TAR_OBJS) \ - $(UDF_OBJS) \ - $(WIM_OBJS) \ diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index fb803b74c..ef3075c53 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,7 +8,7 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=9.2 +pkgrel=9.3 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support' url='http://p7zip.sourceforge.net/' license=('GPL') @@ -20,34 +20,36 @@ depends=('gcc-libs' 'bash') optdepends=('wxgtk2.8: GUI' 'desktop-file-utils: desktop entries') makedepends=('yasm' 'nasm' 'wxgtk2.8') -mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2" - 'p7zip-libre.patch' 'parent-folder-icon.patch') +mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2") source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2" - '7zFM.desktop') -mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7' - '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed' - '335a4a38d457d2b0166538d514ffd3c183bbb37f') -sha1sums=('ef3f668f5d75941f7a3ba7873e4b234b9f97445b' - 'f2c370d6f1b286b7ce9a2804e22541b755616a40') + '7zFM.desktop' 'libre.patch') +mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7') +sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8' + 'f2c370d6f1b286b7ce9a2804e22541b755616a40' + 'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3') options=('!makeflags') install=install mksource() { cd "${srcdir}/${_pkgname}_${pkgver}" - msg "Removing unRar" - # Generate patch - # sed -e '/Rar/d' -i makefile* - # find -name '*Rar*' -print0 | xargs -0 rm -rvf - # Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile - patch -Np1 -i ../p7zip-libre.patch - msg 'Replacing the parent folder icon' + + # Remove nonfree unRAR utility files from the source + rm -rv CPP/7zip/{Archive,Compress}/Rar + rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} + rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} + rm -v DOCS/unRarLicense.txt + + # Remove nonfree parent folder icon rm CPP/7zip/UI/FileManager/res/ParentFolder.h - patch -Np1 -i ../parent-folder-icon.patch } prepare() { cd "${srcdir}/${_pkgname}_${pkgver}" + + # remove rar and parent folder icon references + patch -Np1 -i ../libre.patch + rm GUI/kde4/p7zip_compress.desktop [[ $CARCH = x86_64 ]] \ && cp makefile.linux_amd64_asm makefile.machine \ diff --git a/libre/p7zip-libre/libre.patch b/libre/p7zip-libre/libre.patch new file mode 100644 index 000000000..86b2caebc --- /dev/null +++ b/libre/p7zip-libre/libre.patch @@ -0,0 +1,170 @@ +diff -Nur p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile +--- p7zip_9.20.1.orig/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 13:41:43.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2014-05-03 11:19:47.618563272 -0300 +@@ -158,14 +158,6 @@ + NsisIn.o \ + NsisRegister.o \ + +-RAR_OBJS = \ +- RarHandler.o \ +- RarHeader.o \ +- RarIn.o \ +- RarItem.o \ +- RarVolumeInStream.o \ +- RarRegister.o \ +- + TAR_OBJS = \ + TarHandler.o \ + TarHandlerOut.o \ +@@ -243,13 +235,6 @@ + ZlibEncoder.o \ + ZDecoder.o \ + +-COMPRESS_OBJS_NON_FREE = \ +- Rar1Decoder.o \ +- Rar2Decoder.o \ +- Rar3Decoder.o \ +- Rar3Vm.o \ +- RarCodecsRegister.o \ +- + CRYPTO_OBJS = \ + 7zAes.o \ + 7zAesRegister.o \ +@@ -257,8 +242,6 @@ + MyAes.o \ + Pbkdf2HmacSha1.o \ + RandGen.o \ +- Rar20Crypto.o \ +- RarAes.o \ + Sha1.o \ + WzAes.o \ + ZipCrypto.o \ +diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp +--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 13:55:36.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-05-03 11:28:17.542065931 -0300 +@@ -774,8 +774,6 @@ + + ///////////////////////////////////////////////////// + +-#include "res/ParentFolder.h" +- + SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : + wxPanel(parent,id) , m_frame(frame), _wList(0) + { +@@ -793,7 +791,7 @@ + int sizes[] = {150, 250, 350, -1}; + wxArrayString pathArray; + wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); +- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); ++ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); + m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); + pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); + pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); +diff -Nur p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend +--- p7zip_9.20.1.orig/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 07:33:17.000000000 -0200 ++++ p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2014-05-03 11:28:17.545399286 -0300 +@@ -714,7 +714,7 @@ + res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \ + res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \ + ../../../Common/MyString.h ../../../Windows/ResourceString.h \ +- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h ++ /usr/include/wx-2.8/wx/mstream.h + OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \ + ../../../myWindows/config.h ../../../Common/MyWindows.h \ + ../../../Common/MyGuidDef.h ../../../Common/Types.h \ +diff -Nur p7zip_9.20.1.orig/makefile p7zip_9.20.1/makefile +--- p7zip_9.20.1.orig/makefile 2011-03-13 08:52:45.000000000 -0300 ++++ p7zip_9.20.1/makefile 2014-05-03 11:19:47.618563272 -0300 +@@ -56,7 +56,6 @@ + $(MAKE) -C CPP/7zip/UI/Client7z depend + $(MAKE) -C CPP/7zip/UI/Console depend + $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend +- $(MAKE) -C CPP/7zip/Compress/Rar depend + $(MAKE) -C CPP/7zip/UI/GUI depend + $(MAKE) -C CPP/7zip/UI/FileManager depend + $(MAKE) -C check/my_86_filter depend +@@ -68,7 +67,6 @@ + common7z:common + $(MKDIR) bin/Codecs + $(MAKE) -C CPP/7zip/Bundles/Format7zFree all +- $(MAKE) -C CPP/7zip/Compress/Rar all + + 7z: common7z + $(MAKE) -C CPP/7zip/UI/Console all +@@ -93,7 +91,6 @@ + $(MAKE) -C CPP/7zip/UI/FileManager clean + $(MAKE) -C CPP/7zip/UI/GUI clean + $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean +- $(MAKE) -C CPP/7zip/Compress/Rar clean + $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean + $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean + $(MAKE) -C CPP/7zip/TEST/TestUI clean +diff -Nur p7zip_9.20.1.orig/makefile.oldmake p7zip_9.20.1/makefile.oldmake +--- p7zip_9.20.1.orig/makefile.oldmake 2011-03-13 08:53:08.000000000 -0300 ++++ p7zip_9.20.1/makefile.oldmake 2014-05-03 11:19:47.618563272 -0300 +@@ -56,7 +56,6 @@ + cd CPP/7zip/UI/Client7z ; $(MAKE) depend + cd CPP/7zip/UI/Console ; $(MAKE) depend + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend +- cd CPP/7zip/Compress/Rar ; $(MAKE) depend + cd CPP/7zip/UI/GUI ; $(MAKE) depend + cd CPP/7zip/UI/FileManager ; $(MAKE) depend + cd check/my_86_filter ; $(MAKE) depend +@@ -68,7 +67,6 @@ + common7z:common + $(MKDIR) bin/Codecs + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all +- cd CPP/7zip/Compress/Rar ; $(MAKE) all + + 7z: common7z + cd CPP/7zip/UI/Console ; $(MAKE) all +@@ -93,7 +91,6 @@ + cd CPP/7zip/UI/FileManager ; $(MAKE) clean + cd CPP/7zip/UI/GUI ; $(MAKE) clean + cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean +- cd CPP/7zip/Compress/Rar ; $(MAKE) clean + cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean + cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean + cd CPP/7zip/TEST/TestUI ; $(MAKE) clean +diff -Nur p7zip_9.20.1.orig/makefile.qnx_shared.so p7zip_9.20.1/makefile.qnx_shared.so +--- p7zip_9.20.1.orig/makefile.qnx_shared.so 2007-06-28 04:34:14.000000000 -0300 ++++ p7zip_9.20.1/makefile.qnx_shared.so 2014-05-03 11:19:47.618563272 -0300 +@@ -1,5 +1,4 @@ + ################################################### +-# makefile.machine for "7z.so , Codecs/Rar29.so" : + # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target + + OPTFLAGS=-O +diff -Nur p7zip_9.20.1.orig/makefile.rules p7zip_9.20.1/makefile.rules +--- p7zip_9.20.1.orig/makefile.rules 2010-11-07 14:08:51.000000000 -0200 ++++ p7zip_9.20.1/makefile.rules 2014-05-03 11:19:47.621896630 -0300 +@@ -448,18 +448,6 @@ + NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp + +-RarHandler.o : ../../Archive/Rar/RarHandler.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp +-RarHeader.o : ../../Archive/Rar/RarHeader.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp +-RarIn.o : ../../Archive/Rar/RarIn.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp +-RarItem.o : ../../Archive/Rar/RarItem.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp +-RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp +-RarRegister.o : ../../Archive/Rar/RarRegister.cpp +- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp + + UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp + $(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp +@@ -535,10 +523,6 @@ + $(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp + WzAes.o : ../../Crypto/WzAes.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp +-Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp +-RarAes.o : ../../Crypto/RarAes.cpp +- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp + HmacSha1.o : ../../Crypto/HmacSha1.cpp + $(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp + Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp diff --git a/libre/p7zip-libre/p7zip-libre.patch b/libre/p7zip-libre/p7zip-libre.patch deleted file mode 100644 index 742faf52d..000000000 --- a/libre/p7zip-libre/p7zip-libre.patch +++ /dev/null @@ -1,6540 +0,0 @@ -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp 2011-01-08 06:41:37.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,869 +0,0 @@ --// RarHandler.cpp -- --#include "StdAfx.h" -- --#include "Common/ComTry.h" --#include "Common/IntToString.h" --#include "Common/StringConvert.h" -- --#include "Windows/PropVariant.h" --#include "Windows/PropVariantUtils.h" --#include "Windows/Time.h" -- --#include "../../IPassword.h" -- --#include "../../Common/CreateCoder.h" --#include "../../Common/FilterCoder.h" --#include "../../Common/MethodId.h" --#include "../../Common/ProgressUtils.h" -- --#include "../../Compress/CopyCoder.h" -- --#include "../../Crypto/Rar20Crypto.h" --#include "../../Crypto/RarAes.h" -- --#include "../Common/ItemNameUtils.h" --#include "../Common/OutStreamWithCRC.h" -- --#include "RarHandler.h" -- --using namespace NWindows; --using namespace NTime; -- --namespace NArchive { --namespace NRar { -- --static const wchar_t *kHostOS[] = --{ -- L"MS DOS", -- L"OS/2", -- L"Win32", -- L"Unix", -- L"Mac OS", -- L"BeOS" --}; -- --static const int kNumHostOSes = sizeof(kHostOS) / sizeof(kHostOS[0]); -- --static const wchar_t *kUnknownOS = L"Unknown"; -- --static const CUInt32PCharPair k_Flags[] = --{ -- { 0, "Volume" }, -- { 1, "Comment" }, -- { 2, "Lock" }, -- { 3, "Solid" }, -- { 4, "NewVolName" }, // pack_comment in old versuons -- { 5, "Authenticity" }, -- { 6, "Recovery" }, -- { 7, "BlockEncryption" }, -- { 8, "FirstVolume" }, -- { 9, "EncryptVer" } --}; -- --static const STATPROPSTG kProps[] = --{ -- { NULL, kpidPath, VT_BSTR}, -- { NULL, kpidIsDir, VT_BOOL}, -- { NULL, kpidSize, VT_UI8}, -- { NULL, kpidPackSize, VT_UI8}, -- { NULL, kpidMTime, VT_FILETIME}, -- { NULL, kpidCTime, VT_FILETIME}, -- { NULL, kpidATime, VT_FILETIME}, -- { NULL, kpidAttrib, VT_UI4}, -- -- { NULL, kpidEncrypted, VT_BOOL}, -- { NULL, kpidSolid, VT_BOOL}, -- { NULL, kpidCommented, VT_BOOL}, -- { NULL, kpidSplitBefore, VT_BOOL}, -- { NULL, kpidSplitAfter, VT_BOOL}, -- { NULL, kpidCRC, VT_UI4}, -- { NULL, kpidHostOS, VT_BSTR}, -- { NULL, kpidMethod, VT_BSTR}, -- { NULL, kpidUnpackVer, VT_UI1} --}; -- --static const STATPROPSTG kArcProps[] = --{ -- { NULL, kpidCharacts, VT_BSTR}, -- { NULL, kpidSolid, VT_BOOL}, -- { NULL, kpidNumBlocks, VT_UI4}, -- // { NULL, kpidEncrypted, VT_BOOL}, -- { NULL, kpidIsVolume, VT_BOOL}, -- { NULL, kpidNumVolumes, VT_UI4}, -- { NULL, kpidPhySize, VT_UI8} -- // { NULL, kpidCommented, VT_BOOL} --}; -- --IMP_IInArchive_Props --IMP_IInArchive_ArcProps -- --UInt64 CHandler::GetPackSize(int refIndex) const --{ -- const CRefItem &refItem = _refItems[refIndex]; -- UInt64 totalPackSize = 0; -- for (int i = 0; i < refItem.NumItems; i++) -- totalPackSize += _items[refItem.ItemIndex + i].PackSize; -- return totalPackSize; --} -- --STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) --{ -- COM_TRY_BEGIN -- NWindows::NCOM::CPropVariant prop; -- switch(propID) -- { -- case kpidSolid: prop = _archiveInfo.IsSolid(); break; -- case kpidCharacts: FLAGS_TO_PROP(k_Flags, _archiveInfo.Flags, prop); break; -- // case kpidEncrypted: prop = _archiveInfo.IsEncrypted(); break; // it's for encrypted names. -- case kpidIsVolume: prop = _archiveInfo.IsVolume(); break; -- case kpidNumVolumes: prop = (UInt32)_archives.Size(); break; -- case kpidOffset: if (_archiveInfo.StartPosition != 0) prop = _archiveInfo.StartPosition; break; -- // case kpidCommented: prop = _archiveInfo.IsCommented(); break; -- case kpidNumBlocks: -- { -- UInt32 numBlocks = 0; -- for (int i = 0; i < _refItems.Size(); i++) -- if (!IsSolid(i)) -- numBlocks++; -- prop = (UInt32)numBlocks; -- break; -- } -- case kpidError: if (!_errorMessage.IsEmpty()) prop = _errorMessage; break; -- } -- prop.Detach(value); -- return S_OK; -- COM_TRY_END --} -- --STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems) --{ -- *numItems = _refItems.Size(); -- return S_OK; --} -- --static bool RarTimeToFileTime(const CRarTime &rarTime, FILETIME &result) --{ -- if (!DosTimeToFileTime(rarTime.DosTime, result)) -- return false; -- UInt64 value = (((UInt64)result.dwHighDateTime) << 32) + result.dwLowDateTime; -- value += (UInt64)rarTime.LowSecond * 10000000; -- value += ((UInt64)rarTime.SubTime[2] << 16) + -- ((UInt64)rarTime.SubTime[1] << 8) + -- ((UInt64)rarTime.SubTime[0]); -- result.dwLowDateTime = (DWORD)value; -- result.dwHighDateTime = DWORD(value >> 32); -- return true; --} -- --static void RarTimeToProp(const CRarTime &rarTime, NWindows::NCOM::CPropVariant &prop) --{ -- FILETIME localFileTime, utcFileTime; -- if (RarTimeToFileTime(rarTime, localFileTime)) -- { -- if (!LocalFileTimeToFileTime(&localFileTime, &utcFileTime)) -- utcFileTime.dwHighDateTime = utcFileTime.dwLowDateTime = 0; -- } -- else -- utcFileTime.dwHighDateTime = utcFileTime.dwLowDateTime = 0; -- prop = utcFileTime; --} -- --STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value) --{ -- COM_TRY_BEGIN -- NWindows::NCOM::CPropVariant prop; -- const CRefItem &refItem = _refItems[index]; -- const CItemEx &item = _items[refItem.ItemIndex]; -- switch(propID) -- { -- case kpidPath: -- { -- UString u; -- if (item.HasUnicodeName() && !item.UnicodeName.IsEmpty()) -- u = item.UnicodeName; -- else -- u = MultiByteToUnicodeString(item.Name, CP_OEMCP); -- prop = (const wchar_t *)NItemName::WinNameToOSName(u); -- break; -- } -- case kpidIsDir: prop = item.IsDir(); break; -- case kpidSize: prop = item.Size; break; -- case kpidPackSize: prop = GetPackSize(index); break; -- case kpidMTime: RarTimeToProp(item.MTime, prop); break; -- case kpidCTime: if (item.CTimeDefined) RarTimeToProp(item.CTime, prop); break; -- case kpidATime: if (item.ATimeDefined) RarTimeToProp(item.ATime, prop); break; -- case kpidAttrib: prop = item.GetWinAttributes(); break; -- case kpidEncrypted: prop = item.IsEncrypted(); break; -- case kpidSolid: prop = IsSolid(index); break; -- case kpidCommented: prop = item.IsCommented(); break; -- case kpidSplitBefore: prop = item.IsSplitBefore(); break; -- case kpidSplitAfter: prop = _items[refItem.ItemIndex + refItem.NumItems - 1].IsSplitAfter(); break; -- case kpidCRC: -- { -- const CItemEx &lastItem = _items[refItem.ItemIndex + refItem.NumItems - 1]; -- prop = ((lastItem.IsSplitAfter()) ? item.FileCRC : lastItem.FileCRC); -- break; -- } -- case kpidUnpackVer: prop = item.UnPackVersion; break; -- case kpidMethod: -- { -- UString method; -- if (item.Method >= Byte('0') && item.Method <= Byte('5')) -- { -- method = L"m"; -- wchar_t temp[32]; -- ConvertUInt64ToString(item.Method - Byte('0'), temp); -- method += temp; -- if (!item.IsDir()) -- { -- method += L":"; -- ConvertUInt64ToString(16 + item.GetDictSize(), temp); -- method += temp; -- } -- } -- else -- { -- wchar_t temp[32]; -- ConvertUInt64ToString(item.Method, temp); -- method += temp; -- } -- prop = method; -- break; -- } -- case kpidHostOS: prop = (item.HostOS < kNumHostOSes) ? (kHostOS[item.HostOS]) : kUnknownOS; break; -- } -- prop.Detach(value); -- return S_OK; -- COM_TRY_END --} -- --class CVolumeName --{ -- bool _first; -- bool _newStyle; -- UString _unchangedPart; -- UString _changedPart; -- UString _afterPart; --public: -- CVolumeName(): _newStyle(true) {}; -- -- bool InitName(const UString &name, bool newStyle) -- { -- _first = true; -- _newStyle = newStyle; -- int dotPos = name.ReverseFind('.'); -- UString basePart = name; -- if (dotPos >= 0) -- { -- UString ext = name.Mid(dotPos + 1); -- if (ext.CompareNoCase(L"rar") == 0) -- { -- _afterPart = name.Mid(dotPos); -- basePart = name.Left(dotPos); -- } -- else if (ext.CompareNoCase(L"exe") == 0) -- { -- _afterPart = L".rar"; -- basePart = name.Left(dotPos); -- } -- else if (!_newStyle) -- { -- if (ext.CompareNoCase(L"000") == 0 || -- ext.CompareNoCase(L"001") == 0 || -- ext.CompareNoCase(L"r00") == 0 || -- ext.CompareNoCase(L"r01") == 0) -- { -- _afterPart.Empty(); -- _first = false; -- _changedPart = ext; -- _unchangedPart = name.Left(dotPos + 1); -- return true; -- } -- } -- } -- -- if (!_newStyle) -- { -- _afterPart.Empty(); -- _unchangedPart = basePart + UString(L"."); -- _changedPart = L"r00"; -- return true; -- } -- -- int numLetters = 1; -- if (basePart.Right(numLetters) == L"1" || basePart.Right(numLetters) == L"0") -- { -- while (numLetters < basePart.Length()) -- { -- if (basePart[basePart.Length() - numLetters - 1] != '0') -- break; -- numLetters++; -- } -- } -- else -- return false; -- _unchangedPart = basePart.Left(basePart.Length() - numLetters); -- _changedPart = basePart.Right(numLetters); -- return true; -- } -- -- UString GetNextName() -- { -- UString newName; -- if (_newStyle || !_first) -- { -- int i; -- int numLetters = _changedPart.Length(); -- for (i = numLetters - 1; i >= 0; i--) -- { -- wchar_t c = _changedPart[i]; -- if (c == L'9') -- { -- c = L'0'; -- newName = c + newName; -- if (i == 0) -- newName = UString(L'1') + newName; -- continue; -- } -- c++; -- newName = UString(c) + newName; -- i--; -- for (; i >= 0; i--) -- newName = _changedPart[i] + newName; -- break; -- } -- _changedPart = newName; -- } -- _first = false; -- return _unchangedPart + _changedPart + _afterPart; -- } --}; -- --HRESULT CHandler::Open2(IInStream *stream, -- const UInt64 *maxCheckStartPosition, -- IArchiveOpenCallback *openCallback) --{ -- { -- CMyComPtr openVolumeCallback; -- CMyComPtr getTextPassword; -- CMyComPtr openArchiveCallbackWrap = openCallback; -- -- CVolumeName seqName; -- -- UInt64 totalBytes = 0; -- UInt64 curBytes = 0; -- -- if (openCallback) -- { -- openArchiveCallbackWrap.QueryInterface(IID_IArchiveOpenVolumeCallback, &openVolumeCallback); -- openArchiveCallbackWrap.QueryInterface(IID_ICryptoGetTextPassword, &getTextPassword); -- } -- -- for (;;) -- { -- CMyComPtr inStream; -- if (!_archives.IsEmpty()) -- { -- if (!openVolumeCallback) -- break; -- -- if (_archives.Size() == 1) -- { -- if (!_archiveInfo.IsVolume()) -- break; -- UString baseName; -- { -- NCOM::CPropVariant prop; -- RINOK(openVolumeCallback->GetProperty(kpidName, &prop)); -- if (prop.vt != VT_BSTR) -- break; -- baseName = prop.bstrVal; -- } -- seqName.InitName(baseName, _archiveInfo.HaveNewVolumeName()); -- } -- -- UString fullName = seqName.GetNextName(); -- HRESULT result = openVolumeCallback->GetStream(fullName, &inStream); -- if (result == S_FALSE) -- break; -- if (result != S_OK) -- return result; -- if (!stream) -- break; -- } -- else -- inStream = stream; -- -- UInt64 endPos = 0; -- RINOK(stream->Seek(0, STREAM_SEEK_END, &endPos)); -- RINOK(stream->Seek(0, STREAM_SEEK_SET, NULL)); -- if (openCallback) -- { -- totalBytes += endPos; -- RINOK(openCallback->SetTotal(NULL, &totalBytes)); -- } -- -- NArchive::NRar::CInArchive archive; -- RINOK(archive.Open(inStream, maxCheckStartPosition)); -- -- if (_archives.IsEmpty()) -- archive.GetArchiveInfo(_archiveInfo); -- -- CItemEx item; -- for (;;) -- { -- if (archive.m_Position > endPos) -- { -- AddErrorMessage("Unexpected end of archive"); -- break; -- } -- bool decryptionError; -- AString errorMessageLoc; -- HRESULT result = archive.GetNextItem(item, getTextPassword, decryptionError, errorMessageLoc); -- if (errorMessageLoc) -- AddErrorMessage(errorMessageLoc); -- if (result == S_FALSE) -- { -- if (decryptionError && _items.IsEmpty()) -- return S_FALSE; -- break; -- } -- RINOK(result); -- if (item.IgnoreItem()) -- continue; -- -- bool needAdd = true; -- if (item.IsSplitBefore()) -- { -- if (!_refItems.IsEmpty()) -- { -- CRefItem &refItem = _refItems.Back(); -- refItem.NumItems++; -- needAdd = false; -- } -- } -- if (needAdd) -- { -- CRefItem refItem; -- refItem.ItemIndex = _items.Size(); -- refItem.NumItems = 1; -- refItem.VolumeIndex = _archives.Size(); -- _refItems.Add(refItem); -- } -- _items.Add(item); -- if (openCallback && _items.Size() % 100 == 0) -- { -- UInt64 numFiles = _items.Size(); -- UInt64 numBytes = curBytes + item.Position; -- RINOK(openCallback->SetCompleted(&numFiles, &numBytes)); -- } -- } -- curBytes += endPos; -- _archives.Add(archive); -- } -- } -- return S_OK; --} -- --STDMETHODIMP CHandler::Open(IInStream *stream, -- const UInt64 *maxCheckStartPosition, -- IArchiveOpenCallback *openCallback) --{ -- COM_TRY_BEGIN -- Close(); -- try -- { -- HRESULT res = Open2(stream, maxCheckStartPosition, openCallback); -- if (res != S_OK) -- Close(); -- return res; -- } -- catch(const CInArchiveException &) { Close(); return S_FALSE; } -- catch(...) { Close(); throw; } -- COM_TRY_END --} -- --STDMETHODIMP CHandler::Close() --{ -- COM_TRY_BEGIN -- _errorMessage.Empty(); -- _refItems.Clear(); -- _items.Clear(); -- _archives.Clear(); -- return S_OK; -- COM_TRY_END --} -- --struct CMethodItem --{ -- Byte RarUnPackVersion; -- CMyComPtr Coder; --}; -- -- --STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems, -- Int32 testMode, IArchiveExtractCallback *extractCallback) --{ -- COM_TRY_BEGIN -- CMyComPtr getTextPassword; -- UInt64 censoredTotalUnPacked = 0, -- // censoredTotalPacked = 0, -- importantTotalUnPacked = 0; -- // importantTotalPacked = 0; -- bool allFilesMode = (numItems == (UInt32)-1); -- if (allFilesMode) -- numItems = _refItems.Size(); -- if (numItems == 0) -- return S_OK; -- int lastIndex = 0; -- CRecordVector importantIndexes; -- CRecordVector extractStatuses; -- -- for (UInt32 t = 0; t < numItems; t++) -- { -- int index = allFilesMode ? t : indices[t]; -- const CRefItem &refItem = _refItems[index]; -- const CItemEx &item = _items[refItem.ItemIndex]; -- censoredTotalUnPacked += item.Size; -- // censoredTotalPacked += item.PackSize; -- int j; -- for (j = lastIndex; j <= index; j++) -- // if (!_items[_refItems[j].ItemIndex].IsSolid()) -- if (!IsSolid(j)) -- lastIndex = j; -- for (j = lastIndex; j <= index; j++) -- { -- const CRefItem &refItem = _refItems[j]; -- const CItemEx &item = _items[refItem.ItemIndex]; -- -- // const CItemEx &item = _items[j]; -- -- importantTotalUnPacked += item.Size; -- // importantTotalPacked += item.PackSize; -- importantIndexes.Add(j); -- extractStatuses.Add(j == index); -- } -- lastIndex = index + 1; -- } -- -- RINOK(extractCallback->SetTotal(importantTotalUnPacked)); -- UInt64 currentImportantTotalUnPacked = 0; -- UInt64 currentImportantTotalPacked = 0; -- UInt64 currentUnPackSize, currentPackSize; -- -- CObjectVector methodItems; -- -- NCompress::CCopyCoder *copyCoderSpec = new NCompress::CCopyCoder; -- CMyComPtr copyCoder = copyCoderSpec; -- -- CFilterCoder *filterStreamSpec = new CFilterCoder; -- CMyComPtr filterStream = filterStreamSpec; -- -- NCrypto::NRar20::CDecoder *rar20CryptoDecoderSpec = NULL; -- CMyComPtr rar20CryptoDecoder; -- NCrypto::NRar29::CDecoder *rar29CryptoDecoderSpec = NULL; -- CMyComPtr rar29CryptoDecoder; -- -- CFolderInStream *folderInStreamSpec = NULL; -- CMyComPtr folderInStream; -- -- CLocalProgress *lps = new CLocalProgress; -- CMyComPtr progress = lps; -- lps->Init(extractCallback, false); -- -- bool solidStart = true; -- for (int i = 0; i < importantIndexes.Size(); i++, -- currentImportantTotalUnPacked += currentUnPackSize, -- currentImportantTotalPacked += currentPackSize) -- { -- lps->InSize = currentImportantTotalPacked; -- lps->OutSize = currentImportantTotalUnPacked; -- RINOK(lps->SetCur()); -- CMyComPtr realOutStream; -- -- Int32 askMode; -- if (extractStatuses[i]) -- askMode = testMode ? -- NExtract::NAskMode::kTest : -- NExtract::NAskMode::kExtract; -- else -- askMode = NExtract::NAskMode::kSkip; -- -- UInt32 index = importantIndexes[i]; -- -- const CRefItem &refItem = _refItems[index]; -- const CItemEx &item = _items[refItem.ItemIndex]; -- -- currentUnPackSize = item.Size; -- -- currentPackSize = GetPackSize(index); -- -- if (item.IgnoreItem()) -- continue; -- -- RINOK(extractCallback->GetStream(index, &realOutStream, askMode)); -- -- if (!IsSolid(index)) -- solidStart = true; -- if (item.IsDir()) -- { -- RINOK(extractCallback->PrepareOperation(askMode)); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kOK)); -- continue; -- } -- -- bool mustBeProcessedAnywhere = false; -- if (i < importantIndexes.Size() - 1) -- { -- // const CRefItem &nextRefItem = _refItems[importantIndexes[i + 1]]; -- // const CItemEx &nextItemInfo = _items[nextRefItem.ItemIndex]; -- // mustBeProcessedAnywhere = nextItemInfo.IsSolid(); -- mustBeProcessedAnywhere = IsSolid(importantIndexes[i + 1]); -- } -- -- if (!mustBeProcessedAnywhere && !testMode && !realOutStream) -- continue; -- -- if (!realOutStream && !testMode) -- askMode = NExtract::NAskMode::kSkip; -- -- RINOK(extractCallback->PrepareOperation(askMode)); -- -- COutStreamWithCRC *outStreamSpec = new COutStreamWithCRC; -- CMyComPtr outStream(outStreamSpec); -- outStreamSpec->SetStream(realOutStream); -- outStreamSpec->Init(); -- realOutStream.Release(); -- -- /* -- for (int partIndex = 0; partIndex < 1; partIndex++) -- { -- CMyComPtr inStream; -- -- // item redefinition -- const CItemEx &item = _items[refItem.ItemIndex + partIndex]; -- -- NArchive::NRar::CInArchive &archive = _archives[refItem.VolumeIndex + partIndex]; -- -- inStream.Attach(archive.CreateLimitedStream(item.GetDataPosition(), -- item.PackSize)); -- */ -- if (!folderInStream) -- { -- folderInStreamSpec = new CFolderInStream; -- folderInStream = folderInStreamSpec; -- } -- -- folderInStreamSpec->Init(&_archives, &_items, refItem); -- -- UInt64 packSize = currentPackSize; -- -- // packedPos += item.PackSize; -- // unpackedPos += 0; -- -- CMyComPtr inStream; -- if (item.IsEncrypted()) -- { -- CMyComPtr cryptoSetPassword; -- if (item.UnPackVersion >= 29) -- { -- if (!rar29CryptoDecoder) -- { -- rar29CryptoDecoderSpec = new NCrypto::NRar29::CDecoder; -- rar29CryptoDecoder = rar29CryptoDecoderSpec; -- // RINOK(rar29CryptoDecoder.CoCreateInstance(CLSID_CCryptoRar29Decoder)); -- } -- rar29CryptoDecoderSpec->SetRar350Mode(item.UnPackVersion < 36); -- CMyComPtr cryptoProperties; -- RINOK(rar29CryptoDecoder.QueryInterface(IID_ICompressSetDecoderProperties2, -- &cryptoProperties)); -- RINOK(cryptoProperties->SetDecoderProperties2(item.Salt, item.HasSalt() ? sizeof(item.Salt) : 0)); -- filterStreamSpec->Filter = rar29CryptoDecoder; -- } -- else if (item.UnPackVersion >= 20) -- { -- if (!rar20CryptoDecoder) -- { -- rar20CryptoDecoderSpec = new NCrypto::NRar20::CDecoder; -- rar20CryptoDecoder = rar20CryptoDecoderSpec; -- // RINOK(rar20CryptoDecoder.CoCreateInstance(CLSID_CCryptoRar20Decoder)); -- } -- filterStreamSpec->Filter = rar20CryptoDecoder; -- } -- else -- { -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod)); -- continue; -- } -- RINOK(filterStreamSpec->Filter.QueryInterface(IID_ICryptoSetPassword, -- &cryptoSetPassword)); -- -- if (!getTextPassword) -- extractCallback->QueryInterface(IID_ICryptoGetTextPassword, (void **)&getTextPassword); -- if (getTextPassword) -- { -- CMyComBSTR password; -- RINOK(getTextPassword->CryptoGetTextPassword(&password)); -- if (item.UnPackVersion >= 29) -- { -- CByteBuffer buffer; -- UString unicodePassword(password); -- const UInt32 sizeInBytes = unicodePassword.Length() * 2; -- buffer.SetCapacity(sizeInBytes); -- for (int i = 0; i < unicodePassword.Length(); i++) -- { -- wchar_t c = unicodePassword[i]; -- ((Byte *)buffer)[i * 2] = (Byte)c; -- ((Byte *)buffer)[i * 2 + 1] = (Byte)(c >> 8); -- } -- RINOK(cryptoSetPassword->CryptoSetPassword( -- (const Byte *)buffer, sizeInBytes)); -- } -- else -- { -- AString oemPassword = UnicodeStringToMultiByte( -- (const wchar_t *)password, CP_OEMCP); -- RINOK(cryptoSetPassword->CryptoSetPassword( -- (const Byte *)(const char *)oemPassword, oemPassword.Length())); -- } -- } -- else -- { -- RINOK(cryptoSetPassword->CryptoSetPassword(0, 0)); -- } -- filterStreamSpec->SetInStream(folderInStream); -- inStream = filterStream; -- } -- else -- { -- inStream = folderInStream; -- } -- CMyComPtr commonCoder; -- switch(item.Method) -- { -- case '0': -- { -- commonCoder = copyCoder; -- break; -- } -- case '1': -- case '2': -- case '3': -- case '4': -- case '5': -- { -- /* -- if (item.UnPackVersion >= 29) -- { -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod)); -- continue; -- } -- */ -- int m; -- for (m = 0; m < methodItems.Size(); m++) -- if (methodItems[m].RarUnPackVersion == item.UnPackVersion) -- break; -- if (m == methodItems.Size()) -- { -- CMethodItem mi; -- mi.RarUnPackVersion = item.UnPackVersion; -- -- mi.Coder.Release(); -- if (item.UnPackVersion <= 30) -- { -- UInt32 methodID = 0x040300; -- if (item.UnPackVersion < 20) -- methodID += 1; -- else if (item.UnPackVersion < 29) -- methodID += 2; -- else -- methodID += 3; -- RINOK(CreateCoder(EXTERNAL_CODECS_VARS methodID, mi.Coder, false)); -- } -- -- if (mi.Coder == 0) -- { -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod)); -- continue; -- } -- -- m = methodItems.Add(mi); -- } -- CMyComPtr decoder = methodItems[m].Coder; -- -- CMyComPtr compressSetDecoderProperties; -- RINOK(decoder.QueryInterface(IID_ICompressSetDecoderProperties2, -- &compressSetDecoderProperties)); -- -- Byte isSolid = (Byte)((IsSolid(index) || item.IsSplitBefore()) ? 1: 0); -- if (solidStart) -- { -- isSolid = false; -- solidStart = false; -- } -- -- -- RINOK(compressSetDecoderProperties->SetDecoderProperties2(&isSolid, 1)); -- -- commonCoder = decoder; -- break; -- } -- default: -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kUnSupportedMethod)); -- continue; -- } -- HRESULT result = commonCoder->Code(inStream, outStream, &packSize, &item.Size, progress); -- if (item.IsEncrypted()) -- filterStreamSpec->ReleaseInStream(); -- if (result == S_FALSE) -- { -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(NExtract::NOperationResult::kDataError)); -- continue; -- } -- if (result != S_OK) -- return result; -- -- /* -- if (refItem.NumItems == 1 && -- !item.IsSplitBefore() && !item.IsSplitAfter()) -- */ -- { -- const CItemEx &lastItem = _items[refItem.ItemIndex + refItem.NumItems - 1]; -- bool crcOK = outStreamSpec->GetCRC() == lastItem.FileCRC; -- outStream.Release(); -- RINOK(extractCallback->SetOperationResult(crcOK ? -- NExtract::NOperationResult::kOK: -- NExtract::NOperationResult::kCRCError)); -- } -- /* -- else -- { -- bool crcOK = true; -- for (int partIndex = 0; partIndex < refItem.NumItems; partIndex++) -- { -- const CItemEx &item = _items[refItem.ItemIndex + partIndex]; -- if (item.FileCRC != folderInStreamSpec->CRCs[partIndex]) -- { -- crcOK = false; -- break; -- } -- } -- RINOK(extractCallback->SetOperationResult(crcOK ? -- NExtract::NOperationResult::kOK: -- NExtract::NOperationResult::kCRCError)); -- } -- */ -- } -- return S_OK; -- COM_TRY_END --} -- --IMPL_ISetCompressCodecsInfo -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h 2011-01-08 06:41:27.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHandler.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,66 +0,0 @@ --// Rar/Handler.h -- --#ifndef __RAR_HANDLER_H --#define __RAR_HANDLER_H -- --#include "../IArchive.h" -- --#include "../../Common/CreateCoder.h" -- --#include "RarIn.h" --#include "RarVolumeInStream.h" -- --namespace NArchive { --namespace NRar { -- --class CHandler: -- public IInArchive, -- PUBLIC_ISetCompressCodecsInfo -- public CMyUnknownImp --{ -- CRecordVector _refItems; -- CObjectVector _items; -- CObjectVector _archives; -- NArchive::NRar::CInArchiveInfo _archiveInfo; -- AString _errorMessage; -- -- DECL_EXTERNAL_CODECS_VARS -- -- UInt64 GetPackSize(int refIndex) const; -- -- bool IsSolid(int refIndex) -- { -- const CItemEx &item = _items[_refItems[refIndex].ItemIndex]; -- if (item.UnPackVersion < 20) -- { -- if (_archiveInfo.IsSolid()) -- return (refIndex > 0); -- return false; -- } -- return item.IsSolid(); -- } -- void AddErrorMessage(const AString &s) -- { -- if (!_errorMessage.IsEmpty()) -- _errorMessage += '\n'; -- _errorMessage += s; -- } -- -- HRESULT Open2(IInStream *stream, -- const UInt64 *maxCheckStartPosition, -- IArchiveOpenCallback *openCallback); -- --public: -- MY_QUERYINTERFACE_BEGIN2(IInArchive) -- QUERY_ENTRY_ISetCompressCodecsInfo -- MY_QUERYINTERFACE_END -- MY_ADDREF_RELEASE -- -- INTERFACE_IInArchive(;) -- -- DECL_ISetCompressCodecsInfo --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp 2008-08-14 06:11:25.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,21 +0,0 @@ --// Archive/Rar/Headers.cpp -- --#include "StdAfx.h" -- --#include "RarHeader.h" -- --namespace NArchive{ --namespace NRar{ --namespace NHeader{ -- --Byte kMarker[kMarkerSize] = {0x52 + 1, 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00}; -- --class CMarkerInitializer --{ --public: -- CMarkerInitializer() { kMarker[0]--; }; --}; -- --static CMarkerInitializer markerInitializer; -- --}}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h 2011-01-08 06:41:27.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarHeader.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,205 +0,0 @@ --// Archive/RarHeader.h -- --#ifndef __ARCHIVE_RAR_HEADER_H --#define __ARCHIVE_RAR_HEADER_H -- --#include "Common/Types.h" -- --namespace NArchive { --namespace NRar { --namespace NHeader { -- --const int kMarkerSize = 7; --extern Byte kMarker[kMarkerSize]; -- --const int kArchiveSolid = 0x1; -- --namespace NBlockType --{ -- enum EBlockType -- { -- kMarker = 0x72, -- kArchiveHeader, -- kFileHeader, -- kCommentHeader, -- kOldAuthenticity, -- kOldSubBlock, -- kRecoveryRecord, -- kAuthenticity, -- kSubBlock, -- kEndOfArchive -- }; --} -- --namespace NArchive --{ -- const UInt16 kVolume = 1; -- const UInt16 kComment = 2; -- const UInt16 kLock = 4; -- const UInt16 kSolid = 8; -- const UInt16 kNewVolName = 0x10; // ('volname.partN.rar') -- const UInt16 kAuthenticity = 0x20; -- const UInt16 kRecovery = 0x40; -- const UInt16 kBlockEncryption = 0x80; -- const UInt16 kFirstVolume = 0x100; // (set only by RAR 3.0 and later) -- const UInt16 kEncryptVer = 0x200; // RAR 3.6 there is EncryptVer Byte in End of MainHeader -- -- const int kHeaderSizeMin = 7; -- -- const int kArchiveHeaderSize = 13; -- -- const int kBlockHeadersAreEncrypted = 0x80; -- --} -- --namespace NFile --{ -- const int kSplitBefore = 1 << 0; -- const int kSplitAfter = 1 << 1; -- const int kEncrypted = 1 << 2; -- const int kComment = 1 << 3; -- const int kSolid = 1 << 4; -- -- const int kDictBitStart = 5; -- const int kNumDictBits = 3; -- const int kDictMask = (1 << kNumDictBits) - 1; -- const int kDictDirectoryValue = 0x7; -- -- const int kSize64Bits = 1 << 8; -- const int kUnicodeName = 1 << 9; -- const int kSalt = 1 << 10; -- const int kOldVersion = 1 << 11; -- const int kExtTime = 1 << 12; -- // const int kExtFlags = 1 << 13; -- // const int kSkipIfUnknown = 1 << 14; -- -- const int kLongBlock = 1 << 15; -- -- /* -- struct CBlock -- { -- // UInt16 HeadCRC; -- // Byte Type; -- // UInt16 Flags; -- // UInt16 HeadSize; -- UInt32 PackSize; -- UInt32 UnPackSize; -- Byte HostOS; -- UInt32 FileCRC; -- UInt32 Time; -- Byte UnPackVersion; -- Byte Method; -- UInt16 NameSize; -- UInt32 Attributes; -- }; -- */ -- -- /* -- struct CBlock32 -- { -- UInt16 HeadCRC; -- Byte Type; -- UInt16 Flags; -- UInt16 HeadSize; -- UInt32 PackSize; -- UInt32 UnPackSize; -- Byte HostOS; -- UInt32 FileCRC; -- UInt32 Time; -- Byte UnPackVersion; -- Byte Method; -- UInt16 NameSize; -- UInt32 Attributes; -- UInt16 GetRealCRC(const void *aName, UInt32 aNameSize, -- bool anExtraDataDefined = false, Byte *anExtraData = 0) const; -- }; -- struct CBlock64 -- { -- UInt16 HeadCRC; -- Byte Type; -- UInt16 Flags; -- UInt16 HeadSize; -- UInt32 PackSizeLow; -- UInt32 UnPackSizeLow; -- Byte HostOS; -- UInt32 FileCRC; -- UInt32 Time; -- Byte UnPackVersion; -- Byte Method; -- UInt16 NameSize; -- UInt32 Attributes; -- UInt32 PackSizeHigh; -- UInt32 UnPackSizeHigh; -- UInt16 GetRealCRC(const void *aName, UInt32 aNameSize) const; -- }; -- */ -- -- const int kLabelFileAttribute = 0x08; -- const int kWinFileDirectoryAttributeMask = 0x10; -- -- enum CHostOS -- { -- kHostMSDOS = 0, -- kHostOS2 = 1, -- kHostWin32 = 2, -- kHostUnix = 3, -- kHostMacOS = 4, -- kHostBeOS = 5 -- }; --} -- --namespace NBlock --{ -- const UInt16 kLongBlock = 1 << 15; -- struct CBlock -- { -- UInt16 CRC; -- Byte Type; -- UInt16 Flags; -- UInt16 HeadSize; -- // UInt32 DataSize; -- }; --} -- --/* --struct CSubBlock --{ -- UInt16 HeadCRC; -- Byte HeadType; -- UInt16 Flags; -- UInt16 HeadSize; -- UInt32 DataSize; -- UInt16 SubType; -- Byte Level; // Reserved : Must be 0 --}; -- --struct CCommentBlock --{ -- UInt16 HeadCRC; -- Byte HeadType; -- UInt16 Flags; -- UInt16 HeadSize; -- UInt16 UnpSize; -- Byte UnpVer; -- Byte Method; -- UInt16 CommCRC; --}; -- -- --struct CProtectHeader --{ -- UInt16 HeadCRC; -- Byte HeadType; -- UInt16 Flags; -- UInt16 HeadSize; -- UInt32 DataSize; -- Byte Version; -- UInt16 RecSectors; -- UInt32 TotalBlocks; -- Byte Mark[8]; --}; --*/ -- --}}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp 2011-01-08 06:41:37.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,478 +0,0 @@ --// Archive/RarIn.cpp -- --#include "StdAfx.h" -- --#include "../../../../C/7zCrc.h" --#include "../../../../C/CpuArch.h" -- --#include "Common/StringConvert.h" --#include "Common/UTFConvert.h" -- --#include "../../Common/LimitedStreams.h" --#include "../../Common/StreamUtils.h" -- --#include "../Common/FindSignature.h" -- --#include "RarIn.h" -- --#define Get16(p) GetUi16(p) --#define Get32(p) GetUi32(p) --#define Get64(p) GetUi64(p) -- --namespace NArchive { --namespace NRar { -- --static const char *k_UnexpectedEnd = "Unexpected end of archive"; --static const char *k_DecryptionError = "Decryption Error"; -- --void CInArchive::ThrowExceptionWithCode( -- CInArchiveException::CCauseType cause) --{ -- throw CInArchiveException(cause); --} -- --HRESULT CInArchive::Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit) --{ -- try -- { -- Close(); -- HRESULT res = Open2(inStream, searchHeaderSizeLimit); -- if (res == S_OK) -- return res; -- Close(); -- return res; -- } -- catch(...) { Close(); throw; } --} -- --void CInArchive::Close() --{ -- m_Stream.Release(); --} -- --HRESULT CInArchive::ReadBytesSpec(void *data, size_t *resSize) --{ -- if (m_CryptoMode) -- { -- size_t size = *resSize; -- *resSize = 0; -- const Byte *bufData = m_DecryptedDataAligned; -- UInt32 bufSize = m_DecryptedDataSize; -- size_t i; -- for (i = 0; i < size && m_CryptoPos < bufSize; i++) -- ((Byte *)data)[i] = bufData[m_CryptoPos++]; -- *resSize = i; -- return S_OK; -- } -- return ReadStream(m_Stream, data, resSize); --} -- --bool CInArchive::ReadBytesAndTestSize(void *data, UInt32 size) --{ -- size_t processed = size; -- if (ReadBytesSpec(data, &processed) != S_OK) -- return false; -- return processed == size; --} -- --HRESULT CInArchive::Open2(IInStream *stream, const UInt64 *searchHeaderSizeLimit) --{ -- m_CryptoMode = false; -- RINOK(stream->Seek(0, STREAM_SEEK_SET, &m_StreamStartPosition)); -- m_Position = m_StreamStartPosition; -- -- UInt64 arcStartPos; -- RINOK(FindSignatureInStream(stream, NHeader::kMarker, NHeader::kMarkerSize, -- searchHeaderSizeLimit, arcStartPos)); -- m_Position = arcStartPos + NHeader::kMarkerSize; -- RINOK(stream->Seek(m_Position, STREAM_SEEK_SET, NULL)); -- Byte buf[NHeader::NArchive::kArchiveHeaderSize + 1]; -- -- RINOK(ReadStream_FALSE(stream, buf, NHeader::NArchive::kArchiveHeaderSize)); -- AddToSeekValue(NHeader::NArchive::kArchiveHeaderSize); -- -- -- UInt32 blockSize = Get16(buf + 5); -- -- _header.EncryptVersion = 0; -- _header.Flags = Get16(buf + 3); -- -- UInt32 headerSize = NHeader::NArchive::kArchiveHeaderSize; -- if (_header.IsThereEncryptVer()) -- { -- if (blockSize <= headerSize) -- return S_FALSE; -- RINOK(ReadStream_FALSE(stream, buf + NHeader::NArchive::kArchiveHeaderSize, 1)); -- AddToSeekValue(1); -- _header.EncryptVersion = buf[NHeader::NArchive::kArchiveHeaderSize]; -- headerSize += 1; -- } -- if (blockSize < headerSize || -- buf[2] != NHeader::NBlockType::kArchiveHeader || -- (UInt32)Get16(buf) != (CrcCalc(buf + 2, headerSize - 2) & 0xFFFF)) -- return S_FALSE; -- -- size_t commentSize = blockSize - headerSize; -- _comment.SetCapacity(commentSize); -- RINOK(ReadStream_FALSE(stream, _comment, commentSize)); -- AddToSeekValue(commentSize); -- m_Stream = stream; -- _header.StartPosition = arcStartPos; -- return S_OK; --} -- --void CInArchive::GetArchiveInfo(CInArchiveInfo &archiveInfo) const --{ -- archiveInfo = _header; --} -- --static void DecodeUnicodeFileName(const char *name, const Byte *encName, -- int encSize, wchar_t *unicodeName, int maxDecSize) --{ -- int encPos = 0; -- int decPos = 0; -- int flagBits = 0; -- Byte flags = 0; -- Byte highByte = encName[encPos++]; -- while (encPos < encSize && decPos < maxDecSize) -- { -- if (flagBits == 0) -- { -- flags = encName[encPos++]; -- flagBits = 8; -- } -- switch(flags >> 6) -- { -- case 0: -- unicodeName[decPos++] = encName[encPos++]; -- break; -- case 1: -- unicodeName[decPos++] = (wchar_t)(encName[encPos++] + (highByte << 8)); -- break; -- case 2: -- unicodeName[decPos++] = (wchar_t)(encName[encPos] + (encName[encPos + 1] << 8)); -- encPos += 2; -- break; -- case 3: -- { -- int length = encName[encPos++]; -- if (length & 0x80) -- { -- Byte correction = encName[encPos++]; -- for (length = (length & 0x7f) + 2; -- length > 0 && decPos < maxDecSize; length--, decPos++) -- unicodeName[decPos] = (wchar_t)(((name[decPos] + correction) & 0xff) + (highByte << 8)); -- } -- else -- for (length += 2; length > 0 && decPos < maxDecSize; length--, decPos++) -- unicodeName[decPos] = name[decPos]; -- } -- break; -- } -- flags <<= 2; -- flagBits -= 2; -- } -- unicodeName[decPos < maxDecSize ? decPos : maxDecSize - 1] = 0; --} -- --void CInArchive::ReadName(CItemEx &item, int nameSize) --{ -- item.UnicodeName.Empty(); -- if (nameSize > 0) -- { -- m_NameBuffer.EnsureCapacity(nameSize + 1); -- char *buffer = (char *)m_NameBuffer; -- -- for (int i = 0; i < nameSize; i++) -- buffer[i] = ReadByte(); -- -- int mainLen; -- for (mainLen = 0; mainLen < nameSize; mainLen++) -- if (buffer[mainLen] == '\0') -- break; -- buffer[mainLen] = '\0'; -- item.Name = buffer; -- -- if(item.HasUnicodeName()) -- { -- if(mainLen < nameSize) -- { -- int unicodeNameSizeMax = MyMin(nameSize, (0x400)); -- _unicodeNameBuffer.EnsureCapacity(unicodeNameSizeMax + 1); -- DecodeUnicodeFileName(buffer, (const Byte *)buffer + mainLen + 1, -- nameSize - (mainLen + 1), _unicodeNameBuffer, unicodeNameSizeMax); -- item.UnicodeName = _unicodeNameBuffer; -- } -- else if (!ConvertUTF8ToUnicode(item.Name, item.UnicodeName)) -- item.UnicodeName.Empty(); -- } -- } -- else -- item.Name.Empty(); --} -- --Byte CInArchive::ReadByte() --{ -- if (m_CurPos >= m_PosLimit) -- throw CInArchiveException(CInArchiveException::kIncorrectArchive); -- return m_CurData[m_CurPos++]; --} -- --UInt16 CInArchive::ReadUInt16() --{ -- UInt16 value = 0; -- for (int i = 0; i < 2; i++) -- { -- Byte b = ReadByte(); -- value |= (UInt16(b) << (8 * i)); -- } -- return value; --} -- --UInt32 CInArchive::ReadUInt32() --{ -- UInt32 value = 0; -- for (int i = 0; i < 4; i++) -- { -- Byte b = ReadByte(); -- value |= (UInt32(b) << (8 * i)); -- } -- return value; --} -- --void CInArchive::ReadTime(Byte mask, CRarTime &rarTime) --{ -- rarTime.LowSecond = (Byte)(((mask & 4) != 0) ? 1 : 0); -- int numDigits = (mask & 3); -- rarTime.SubTime[0] = rarTime.SubTime[1] = rarTime.SubTime[2] = 0; -- for (int i = 0; i < numDigits; i++) -- rarTime.SubTime[3 - numDigits + i] = ReadByte(); --} -- --void CInArchive::ReadHeaderReal(CItemEx &item) --{ -- item.Flags = m_BlockHeader.Flags; -- item.PackSize = ReadUInt32(); -- item.Size = ReadUInt32(); -- item.HostOS = ReadByte(); -- item.FileCRC = ReadUInt32(); -- item.MTime.DosTime = ReadUInt32(); -- item.UnPackVersion = ReadByte(); -- item.Method = ReadByte(); -- int nameSize = ReadUInt16(); -- item.Attrib = ReadUInt32(); -- -- item.MTime.LowSecond = 0; -- item.MTime.SubTime[0] = -- item.MTime.SubTime[1] = -- item.MTime.SubTime[2] = 0; -- -- if((item.Flags & NHeader::NFile::kSize64Bits) != 0) -- { -- item.PackSize |= ((UInt64)ReadUInt32() << 32); -- item.Size |= ((UInt64)ReadUInt32() << 32); -- } -- -- ReadName(item, nameSize); -- -- if (item.HasSalt()) -- for (int i = 0; i < sizeof(item.Salt); i++) -- item.Salt[i] = ReadByte(); -- -- // some rar archives have HasExtTime flag without field. -- if (m_CurPos < m_PosLimit && item.HasExtTime()) -- { -- Byte accessMask = (Byte)(ReadByte() >> 4); -- Byte b = ReadByte(); -- Byte modifMask = (Byte)(b >> 4); -- Byte createMask = (Byte)(b & 0xF); -- if ((modifMask & 8) != 0) -- ReadTime(modifMask, item.MTime); -- item.CTimeDefined = ((createMask & 8) != 0); -- if (item.CTimeDefined) -- { -- item.CTime.DosTime = ReadUInt32(); -- ReadTime(createMask, item.CTime); -- } -- item.ATimeDefined = ((accessMask & 8) != 0); -- if (item.ATimeDefined) -- { -- item.ATime.DosTime = ReadUInt32(); -- ReadTime(accessMask, item.ATime); -- } -- } -- -- UInt16 fileHeaderWithNameSize = (UInt16)m_CurPos; -- -- item.Position = m_Position; -- item.MainPartSize = fileHeaderWithNameSize; -- item.CommentSize = (UInt16)(m_BlockHeader.HeadSize - fileHeaderWithNameSize); -- -- if (m_CryptoMode) -- item.AlignSize = (UInt16)((16 - ((m_BlockHeader.HeadSize) & 0xF)) & 0xF); -- else -- item.AlignSize = 0; -- AddToSeekValue(m_BlockHeader.HeadSize); --} -- --void CInArchive::AddToSeekValue(UInt64 addValue) --{ -- m_Position += addValue; --} -- --HRESULT CInArchive::GetNextItem(CItemEx &item, ICryptoGetTextPassword *getTextPassword, bool &decryptionError, AString &errorMessage) --{ -- decryptionError = false; -- for (;;) -- { -- SeekInArchive(m_Position); -- if (!m_CryptoMode && (_header.Flags & -- NHeader::NArchive::kBlockHeadersAreEncrypted) != 0) -- { -- m_CryptoMode = false; -- if (getTextPassword == 0) -- return S_FALSE; -- if (!m_RarAES) -- { -- m_RarAESSpec = new NCrypto::NRar29::CDecoder; -- m_RarAES = m_RarAESSpec; -- } -- m_RarAESSpec->SetRar350Mode(_header.IsEncryptOld()); -- -- // Salt -- const UInt32 kSaltSize = 8; -- Byte salt[kSaltSize]; -- if(!ReadBytesAndTestSize(salt, kSaltSize)) -- return S_FALSE; -- m_Position += kSaltSize; -- RINOK(m_RarAESSpec->SetDecoderProperties2(salt, kSaltSize)) -- // Password -- CMyComBSTR password; -- RINOK(getTextPassword->CryptoGetTextPassword(&password)) -- UString unicodePassword(password); -- -- CByteBuffer buffer; -- const UInt32 sizeInBytes = unicodePassword.Length() * 2; -- buffer.SetCapacity(sizeInBytes); -- for (int i = 0; i < unicodePassword.Length(); i++) -- { -- wchar_t c = unicodePassword[i]; -- ((Byte *)buffer)[i * 2] = (Byte)c; -- ((Byte *)buffer)[i * 2 + 1] = (Byte)(c >> 8); -- } -- -- RINOK(m_RarAESSpec->CryptoSetPassword((const Byte *)buffer, sizeInBytes)); -- -- const UInt32 kDecryptedBufferSize = (1 << 12); -- if (m_DecryptedData.GetCapacity() == 0) -- { -- const UInt32 kAlign = 16; -- m_DecryptedData.SetCapacity(kDecryptedBufferSize + kAlign); -- m_DecryptedDataAligned = (Byte *)((ptrdiff_t)((Byte *)m_DecryptedData + kAlign - 1) & ~(ptrdiff_t)(kAlign - 1)); -- } -- RINOK(m_RarAES->Init()); -- size_t decryptedDataSizeT = kDecryptedBufferSize; -- RINOK(ReadStream(m_Stream, m_DecryptedDataAligned, &decryptedDataSizeT)); -- m_DecryptedDataSize = (UInt32)decryptedDataSizeT; -- m_DecryptedDataSize = m_RarAES->Filter(m_DecryptedDataAligned, m_DecryptedDataSize); -- -- m_CryptoMode = true; -- m_CryptoPos = 0; -- } -- -- m_FileHeaderData.EnsureCapacity(7); -- size_t processed = 7; -- RINOK(ReadBytesSpec((Byte *)m_FileHeaderData, &processed)); -- if (processed != 7) -- { -- if (processed != 0) -- errorMessage = k_UnexpectedEnd; -- return S_FALSE; -- } -- -- m_CurData = (Byte *)m_FileHeaderData; -- m_CurPos = 0; -- m_PosLimit = 7; -- m_BlockHeader.CRC = ReadUInt16(); -- m_BlockHeader.Type = ReadByte(); -- m_BlockHeader.Flags = ReadUInt16(); -- m_BlockHeader.HeadSize = ReadUInt16(); -- -- if (m_BlockHeader.HeadSize < 7) -- ThrowExceptionWithCode(CInArchiveException::kIncorrectArchive); -- -- if (m_BlockHeader.Type == NHeader::NBlockType::kEndOfArchive) -- return S_FALSE; -- -- if (m_BlockHeader.Type == NHeader::NBlockType::kFileHeader) -- { -- m_FileHeaderData.EnsureCapacity(m_BlockHeader.HeadSize); -- m_CurData = (Byte *)m_FileHeaderData; -- m_PosLimit = m_BlockHeader.HeadSize; -- if (!ReadBytesAndTestSize(m_CurData + m_CurPos, m_BlockHeader.HeadSize - 7)) -- { -- errorMessage = k_UnexpectedEnd; -- return S_FALSE; -- } -- -- ReadHeaderReal(item); -- if ((CrcCalc(m_CurData + 2, -- m_BlockHeader.HeadSize - item.CommentSize - 2) & 0xFFFF) != m_BlockHeader.CRC) -- ThrowExceptionWithCode(CInArchiveException::kFileHeaderCRCError); -- -- FinishCryptoBlock(); -- m_CryptoMode = false; -- SeekInArchive(m_Position); // Move Position to compressed Data; -- AddToSeekValue(item.PackSize); // m_Position points to next header; -- return S_OK; -- } -- if (m_CryptoMode && m_BlockHeader.HeadSize > (1 << 10)) -- { -- decryptionError = true; -- errorMessage = k_DecryptionError; -- return S_FALSE; -- } -- if ((m_BlockHeader.Flags & NHeader::NBlock::kLongBlock) != 0) -- { -- m_FileHeaderData.EnsureCapacity(7 + 4); -- m_CurData = (Byte *)m_FileHeaderData; -- if (!ReadBytesAndTestSize(m_CurData + m_CurPos, 4)) -- { -- errorMessage = k_UnexpectedEnd; -- return S_FALSE; -- } -- m_PosLimit = 7 + 4; -- UInt32 dataSize = ReadUInt32(); -- AddToSeekValue(dataSize); -- if (m_CryptoMode && dataSize > (1 << 27)) -- { -- decryptionError = true; -- errorMessage = k_DecryptionError; -- return S_FALSE; -- } -- m_CryptoPos = m_BlockHeader.HeadSize; -- } -- else -- m_CryptoPos = 0; -- AddToSeekValue(m_BlockHeader.HeadSize); -- FinishCryptoBlock(); -- m_CryptoMode = false; -- } --} -- --void CInArchive::SeekInArchive(UInt64 position) --{ -- m_Stream->Seek(position, STREAM_SEEK_SET, NULL); --} -- --ISequentialInStream* CInArchive::CreateLimitedStream(UInt64 position, UInt64 size) --{ -- CLimitedSequentialInStream *streamSpec = new CLimitedSequentialInStream; -- CMyComPtr inStream(streamSpec); -- SeekInArchive(position); -- streamSpec->SetStream(m_Stream); -- streamSpec->Init(size); -- return inStream.Detach(); --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.h ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarIn.h 2011-01-08 06:41:27.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarIn.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,123 +0,0 @@ --// RarIn.h -- --#ifndef __ARCHIVE_RAR_IN_H --#define __ARCHIVE_RAR_IN_H -- --#include "Common/DynamicBuffer.h" --#include "Common/MyCom.h" -- --#include "../../ICoder.h" --#include "../../IStream.h" -- --#include "../../Common/StreamObjects.h" -- --#include "../../Crypto/RarAes.h" -- --#include "RarHeader.h" --#include "RarItem.h" -- --namespace NArchive { --namespace NRar { -- --class CInArchiveException --{ --public: -- enum CCauseType -- { -- kUnexpectedEndOfArchive = 0, -- kArchiveHeaderCRCError, -- kFileHeaderCRCError, -- kIncorrectArchive -- } -- Cause; -- CInArchiveException(CCauseType cause) : Cause(cause) {} --}; -- -- --struct CInArchiveInfo --{ -- UInt32 Flags; -- Byte EncryptVersion; -- UInt64 StartPosition; -- -- bool IsSolid() const { return (Flags & NHeader::NArchive::kSolid) != 0; } -- bool IsCommented() const { return (Flags & NHeader::NArchive::kComment) != 0; } -- bool IsVolume() const { return (Flags & NHeader::NArchive::kVolume) != 0; } -- bool HaveNewVolumeName() const { return (Flags & NHeader::NArchive::kNewVolName) != 0; } -- bool IsEncrypted() const { return (Flags & NHeader::NArchive::kBlockEncryption) != 0; } -- bool IsThereEncryptVer() const { return (Flags & NHeader::NArchive::kEncryptVer) != 0; } -- bool IsEncryptOld() const { return (!IsThereEncryptVer() || EncryptVersion < 36); } --}; -- --class CInArchive --{ -- CMyComPtr m_Stream; -- -- UInt64 m_StreamStartPosition; -- -- CInArchiveInfo _header; -- CDynamicBuffer m_NameBuffer; -- CDynamicBuffer _unicodeNameBuffer; -- -- CByteBuffer _comment; -- -- void ReadName(CItemEx &item, int nameSize); -- void ReadHeaderReal(CItemEx &item); -- -- HRESULT ReadBytesSpec(void *data, size_t *size); -- bool ReadBytesAndTestSize(void *data, UInt32 size); -- -- HRESULT Open2(IInStream *stream, const UInt64 *searchHeaderSizeLimit); -- -- void ThrowExceptionWithCode(CInArchiveException::CCauseType cause); -- void ThrowUnexpectedEndOfArchiveException(); -- -- void AddToSeekValue(UInt64 addValue); -- -- CDynamicBuffer m_FileHeaderData; -- -- NHeader::NBlock::CBlock m_BlockHeader; -- -- NCrypto::NRar29::CDecoder *m_RarAESSpec; -- CMyComPtr m_RarAES; -- -- Byte *m_CurData; // it must point to start of Rar::Block -- UInt32 m_CurPos; -- UInt32 m_PosLimit; -- Byte ReadByte(); -- UInt16 ReadUInt16(); -- UInt32 ReadUInt32(); -- void ReadTime(Byte mask, CRarTime &rarTime); -- -- CBuffer m_DecryptedData; -- Byte *m_DecryptedDataAligned; -- UInt32 m_DecryptedDataSize; -- -- bool m_CryptoMode; -- UInt32 m_CryptoPos; -- void FinishCryptoBlock() -- { -- if (m_CryptoMode) -- while ((m_CryptoPos & 0xF) != 0) -- { -- m_CryptoPos++; -- m_Position++; -- } -- } -- --public: -- UInt64 m_Position; -- -- HRESULT Open(IInStream *inStream, const UInt64 *searchHeaderSizeLimit); -- void Close(); -- HRESULT GetNextItem(CItemEx &item, ICryptoGetTextPassword *getTextPassword, bool &decryptionError, AString &errorMessage); -- -- void GetArchiveInfo(CInArchiveInfo &archiveInfo) const; -- -- void SeekInArchive(UInt64 position); -- ISequentialInStream *CreateLimitedStream(UInt64 position, UInt64 size); --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp 2008-08-14 06:11:25.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,55 +0,0 @@ --// RarItem.cpp -- --#include "StdAfx.h" -- --#include "RarItem.h" -- --namespace NArchive{ --namespace NRar{ -- --bool CItem::IgnoreItem() const --{ -- switch(HostOS) -- { -- case NHeader::NFile::kHostMSDOS: -- case NHeader::NFile::kHostOS2: -- case NHeader::NFile::kHostWin32: -- return ((Attrib & NHeader::NFile::kLabelFileAttribute) != 0); -- } -- return false; --} -- --bool CItem::IsDir() const --{ -- if (GetDictSize() == NHeader::NFile::kDictDirectoryValue) -- return true; -- switch(HostOS) -- { -- case NHeader::NFile::kHostMSDOS: -- case NHeader::NFile::kHostOS2: -- case NHeader::NFile::kHostWin32: -- if ((Attrib & FILE_ATTRIBUTE_DIRECTORY) != 0) -- return true; -- } -- return false; --} -- --UInt32 CItem::GetWinAttributes() const --{ -- UInt32 winAttributes; -- switch(HostOS) -- { -- case NHeader::NFile::kHostMSDOS: -- case NHeader::NFile::kHostOS2: -- case NHeader::NFile::kHostWin32: -- winAttributes = Attrib; -- break; -- default: -- winAttributes = 0; // must be converted from unix value; -- } -- if (IsDir()) -- winAttributes |= NHeader::NFile::kWinFileDirectoryAttributeMask; -- return winAttributes; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.h ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarItem.h 2008-08-14 06:11:12.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarItem.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,79 +0,0 @@ --// RarItem.h -- --#ifndef __ARCHIVE_RAR_ITEM_H --#define __ARCHIVE_RAR_ITEM_H -- --#include "Common/Types.h" --#include "Common/MyString.h" -- --#include "RarHeader.h" -- --namespace NArchive{ --namespace NRar{ -- --struct CRarTime --{ -- UInt32 DosTime; -- Byte LowSecond; -- Byte SubTime[3]; --}; -- --struct CItem --{ -- UInt64 Size; -- UInt64 PackSize; -- -- CRarTime CTime; -- CRarTime ATime; -- CRarTime MTime; -- -- UInt32 FileCRC; -- UInt32 Attrib; -- -- UInt16 Flags; -- Byte HostOS; -- Byte UnPackVersion; -- Byte Method; -- -- bool CTimeDefined; -- bool ATimeDefined; -- -- AString Name; -- UString UnicodeName; -- -- Byte Salt[8]; -- -- bool IsEncrypted() const { return (Flags & NHeader::NFile::kEncrypted) != 0; } -- bool IsSolid() const { return (Flags & NHeader::NFile::kSolid) != 0; } -- bool IsCommented() const { return (Flags & NHeader::NFile::kComment) != 0; } -- bool IsSplitBefore() const { return (Flags & NHeader::NFile::kSplitBefore) != 0; } -- bool IsSplitAfter() const { return (Flags & NHeader::NFile::kSplitAfter) != 0; } -- bool HasSalt() const { return (Flags & NHeader::NFile::kSalt) != 0; } -- bool HasExtTime() const { return (Flags & NHeader::NFile::kExtTime) != 0; } -- bool HasUnicodeName()const { return (Flags & NHeader::NFile::kUnicodeName) != 0; } -- bool IsOldVersion() const { return (Flags & NHeader::NFile::kOldVersion) != 0; } -- -- UInt32 GetDictSize() const { return (Flags >> NHeader::NFile::kDictBitStart) & NHeader::NFile::kDictMask; } -- bool IsDir() const; -- bool IgnoreItem() const; -- UInt32 GetWinAttributes() const; -- -- CItem(): CTimeDefined(false), ATimeDefined(false) {} --}; -- --class CItemEx: public CItem --{ --public: -- UInt64 Position; -- UInt16 MainPartSize; -- UInt16 CommentSize; -- UInt16 AlignSize; -- UInt64 GetFullSize() const { return MainPartSize + CommentSize + AlignSize + PackSize; }; -- // DWORD GetHeaderWithCommentSize() const { return MainPartSize + CommentSize; }; -- UInt64 GetCommentPosition() const { return Position + MainPartSize; }; -- UInt64 GetDataPosition() const { return GetCommentPosition() + CommentSize + AlignSize; }; --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp 2009-12-21 08:46:32.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarRegister.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,13 +0,0 @@ --// RarRegister.cpp -- --#include "StdAfx.h" -- --#include "../../Common/RegisterArc.h" -- --#include "RarHandler.h" --static IInArchive *CreateArc() { return new NArchive::NRar::CHandler; } -- --static CArcInfo g_ArcInfo = -- { L"Rar", L"rar r00", 0, 3, {0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00}, 7, false, CreateArc, 0, }; -- --REGISTER_ARC(Rar) -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp 2009-05-30 17:19:19.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,78 +0,0 @@ --// RarVolumeInStream.cpp -- --#include "StdAfx.h" -- --#include "../../../../C/7zCrc.h" -- --#include "RarVolumeInStream.h" -- --namespace NArchive { --namespace NRar { -- --void CFolderInStream::Init( -- CObjectVector *archives, -- const CObjectVector *items, -- const CRefItem &refItem) --{ -- _archives = archives; -- _items = items; -- _refItem = refItem; -- _curIndex = 0; -- CRCs.Clear(); -- _fileIsOpen = false; --} -- --HRESULT CFolderInStream::OpenStream() --{ -- while (_curIndex < _refItem.NumItems) -- { -- const CItemEx &item = (*_items)[_refItem.ItemIndex + _curIndex]; -- _stream.Attach((*_archives)[_refItem.VolumeIndex + _curIndex]. -- CreateLimitedStream(item.GetDataPosition(), item.PackSize)); -- _curIndex++; -- _fileIsOpen = true; -- _crc = CRC_INIT_VAL; -- return S_OK; -- } -- return S_OK; --} -- --HRESULT CFolderInStream::CloseStream() --{ -- CRCs.Add(CRC_GET_DIGEST(_crc)); -- _stream.Release(); -- _fileIsOpen = false; -- return S_OK; --} -- --STDMETHODIMP CFolderInStream::Read(void *data, UInt32 size, UInt32 *processedSize) --{ -- UInt32 realProcessedSize = 0; -- while ((_curIndex < _refItem.NumItems || _fileIsOpen) && size > 0) -- { -- if (_fileIsOpen) -- { -- UInt32 localProcessedSize; -- RINOK(_stream->Read( -- ((Byte *)data) + realProcessedSize, size, &localProcessedSize)); -- _crc = CrcUpdate(_crc, ((Byte *)data) + realProcessedSize, localProcessedSize); -- if (localProcessedSize == 0) -- { -- RINOK(CloseStream()); -- continue; -- } -- realProcessedSize += localProcessedSize; -- size -= localProcessedSize; -- break; -- } -- else -- { -- RINOK(OpenStream()); -- } -- } -- if (processedSize != 0) -- *processedSize = realProcessedSize; -- return S_OK; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h ---- p7zip_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h 2008-08-14 06:11:12.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Archive/Rar/RarVolumeInStream.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,49 +0,0 @@ --// RarVolumeInStream.h -- --#ifndef __RAR_VOLUME_IN_STREAM_H --#define __RAR_VOLUME_IN_STREAM_H -- --#include "../../IStream.h" --#include "RarIn.h" -- --namespace NArchive { --namespace NRar { -- --struct CRefItem --{ -- int VolumeIndex; -- int ItemIndex; -- int NumItems; --}; -- --class CFolderInStream: -- public ISequentialInStream, -- public CMyUnknownImp --{ --public: -- MY_UNKNOWN_IMP -- -- STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize); -- --private: -- CObjectVector *_archives; -- const CObjectVector *_items; -- CRefItem _refItem; -- int _curIndex; -- UInt32 _crc; -- bool _fileIsOpen; -- CMyComPtr _stream; -- -- HRESULT OpenStream(); -- HRESULT CloseStream(); --public: -- void Init(CObjectVector *archives, -- const CObjectVector *items, -- const CRefItem &refItem); -- -- CRecordVector CRCs; --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile p7zip-libre_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile ---- p7zip_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2010-11-07 12:41:43.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Bundles/Format7zFree/makefile 2011-09-07 15:42:04.000000000 -0300 -@@ -158,14 +158,6 @@ - NsisIn.o \ - NsisRegister.o \ - --RAR_OBJS = \ -- RarHandler.o \ -- RarHeader.o \ -- RarIn.o \ -- RarItem.o \ -- RarVolumeInStream.o \ -- RarRegister.o \ -- - TAR_OBJS = \ - TarHandler.o \ - TarHandlerOut.o \ -@@ -243,13 +235,6 @@ - ZlibEncoder.o \ - ZDecoder.o \ - --COMPRESS_OBJS_NON_FREE = \ -- Rar1Decoder.o \ -- Rar2Decoder.o \ -- Rar3Decoder.o \ -- Rar3Vm.o \ -- RarCodecsRegister.o \ -- - CRYPTO_OBJS = \ - 7zAes.o \ - 7zAesRegister.o \ -@@ -257,8 +242,6 @@ - MyAes.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- RarAes.o \ - Sha1.o \ - WzAes.o \ - ZipCrypto.o \ -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile ---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile 2010-03-16 17:21:18.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile 1969-12-31 21:00:00.000000000 -0300 -@@ -1,34 +0,0 @@ --PROG=../../../../bin/Codecs/Rar29.so -- --LOCAL_FLAGS=$(CC_SHARED) -DUNICODE -D_UNICODE -- --MY_WINDOWS= -- --include ../../../../makefile.crc32 --include ../../../../makefile.machine -- --LOCAL_SHARED=$(LINK_SHARED) --LIBS=$(LOCAL_LIBS) -- --OBJS = \ --MyWindows.o \ --CRC.o\ --MyVector.o\ --CodecExports.o \ --DllExports.o \ --Rar1Decoder.o \ --Rar2Decoder.o \ --Rar3Decoder.o \ --Rar3Vm.o \ --RarCodecsRegister.o \ --$(OBJ_CRC32) \ --InBuffer.o \ --OutBuffer.o \ --StreamUtils.o \ --LzOutWindow.o \ --Ppmd7.o \ --Ppmd7Dec.o \ --Alloc.o -- --include ../../../../makefile.glb -- -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.depend p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.depend ---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.depend 2011-02-19 06:33:10.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.depend 1969-12-31 21:00:00.000000000 -0300 -@@ -1,158 +0,0 @@ --CRC.o: ../../../Common/CRC.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../Common/../../C/7zCrc.h \ -- ../../../Common/../../C/Types.h --MyWindows.o: ../../../Common/MyWindows.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../Common/MyWindows.h --MyVector.o: ../../../Common/MyVector.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../Common/MyVector.h \ -- ../../../Common/Defs.h --InBuffer.o: ../../Common/InBuffer.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \ -- ../../Common/InBuffer.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyUnknown.h \ -- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \ -- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h --StreamUtils.o: ../../Common/StreamUtils.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../Common/StreamUtils.h \ -- ../../Common/../IStream.h ../../Common/../../Common/MyUnknown.h \ -- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \ -- ../../Common/../IDecl.h --OutBuffer.o: ../../Common/OutBuffer.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../Common/../../../C/Alloc.h \ -- ../../Common/OutBuffer.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyUnknown.h \ -- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \ -- ../../Common/../IDecl.h ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h --LzOutWindow.o: ../LzOutWindow.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../LzOutWindow.h ../../IStream.h \ -- ../../../Common/MyUnknown.h ../../../Common/MyWindows.h \ -- ../../../Common/Types.h ../../IDecl.h ../../Common/OutBuffer.h \ -- ../../Common/../IStream.h ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyWindows.h \ -- ../../Common/../../Common/MyException.h --CodecExports.o: ../CodecExports.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../Common/ComTry.h \ -- ../../../Common/MyWindows.h ../../../Windows/PropVariant.h \ -- ../../../Windows/../Common/MyWindows.h \ -- ../../../Windows/../Common/Types.h ../../ICoder.h ../../IStream.h \ -- ../../../Common/MyUnknown.h ../../../Common/Types.h ../../IDecl.h \ -- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \ -- ../../Common/../Common/../../Common/Types.h --DllExports.o: ../DllExports.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../Common/MyInitGuid.h \ -- ../../ICoder.h ../../IStream.h ../../../Common/MyUnknown.h \ -- ../../../Common/MyWindows.h ../../../Common/Types.h ../../IDecl.h \ -- ../../Common/RegisterCodec.h ../../Common/../Common/MethodId.h \ -- ../../Common/../Common/../../Common/Types.h --Rar1Decoder.o: ../Rar1Decoder.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../Rar1Decoder.h \ -- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \ -- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \ -- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h \ -- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \ -- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \ -- ../../Common/OutBuffer.h --Rar2Decoder.o: ../Rar2Decoder.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../Rar2Decoder.h \ -- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \ -- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \ -- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h \ -- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \ -- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \ -- ../../Common/OutBuffer.h --Rar3Decoder.o: ../Rar3Decoder.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../../C/Alloc.h \ -- ../../Common/StreamUtils.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyUnknown.h \ -- ../../Common/../../Common/MyWindows.h ../../Common/../../Common/Types.h \ -- ../../Common/../IDecl.h ../Rar3Decoder.h ../../../../C/Ppmd7.h \ -- ../../../../C/Ppmd.h ../../../../C/Types.h ../../../../C/CpuArch.h \ -- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \ -- ../../IStream.h ../../Common/InBuffer.h \ -- ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h ../BitmDecoder.h ../../IStream.h \ -- ../HuffmanDecoder.h ../../../Common/Types.h ../Rar3Vm.h \ -- ../../../../C/CpuArch.h ../../../Common/MyVector.h \ -- ../../../Common/Defs.h --Rar3Vm.o: ../Rar3Vm.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../../../C/7zCrc.h \ -- ../../../../C/Types.h ../../../../C/Alloc.h ../Rar3Vm.h \ -- ../../../../C/CpuArch.h ../../../Common/MyVector.h \ -- ../../../Common/Defs.h --RarCodecsRegister.o: ../RarCodecsRegister.cpp ../../../myWindows/StdAfx.h \ -- ../../../myWindows/config.h ../../../Common/MyWindows.h \ -- ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- ../../../Common/../../C/Types.h ../../../Common/Types.h \ -- ../../../include_windows/windows.h ../../../include_windows/basetyps.h \ -- ../../../include_windows/tchar.h ../../Common/RegisterCodec.h \ -- ../../Common/../Common/MethodId.h \ -- ../../Common/../Common/../../Common/Types.h ../Rar1Decoder.h \ -- ../../../Common/MyCom.h ../../../Common/MyWindows.h ../../ICoder.h \ -- ../../IStream.h ../../../Common/MyUnknown.h ../../../Common/Types.h \ -- ../../IDecl.h ../../Common/InBuffer.h ../../Common/../IStream.h \ -- ../../Common/../../Common/MyCom.h \ -- ../../Common/../../Common/MyException.h \ -- ../../Common/../../Common/MyWindows.h ../BitmDecoder.h ../../IStream.h \ -- ../HuffmanDecoder.h ../../../Common/Types.h ../LzOutWindow.h \ -- ../../Common/OutBuffer.h ../Rar2Decoder.h ../Rar3Decoder.h \ -- ../../../../C/Ppmd7.h ../../../../C/Ppmd.h ../../../../C/Types.h \ -- ../../../../C/CpuArch.h ../Rar3Vm.h ../../../../C/CpuArch.h \ -- ../../../Common/MyVector.h ../../../Common/Defs.h -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.list p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.list ---- p7zip_9.20.1/CPP/7zip/Compress/Rar/makefile.list 2010-03-16 17:23:04.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar/makefile.list 1969-12-31 21:00:00.000000000 -0300 -@@ -1,64 +0,0 @@ --SRCS=\ -- ../../../Common/CRC.cpp \ -- ../../../Common/MyWindows.cpp \ -- ../../../Common/MyVector.cpp \ -- ../../Common/InBuffer.cpp \ -- ../../Common/StreamUtils.cpp \ -- ../../Common/OutBuffer.cpp \ --../LzOutWindow.cpp \ --../CodecExports.cpp \ --../DllExports.cpp \ --../Rar1Decoder.cpp \ --../Rar2Decoder.cpp \ --../Rar3Decoder.cpp \ --../Rar3Vm.cpp \ --../RarCodecsRegister.cpp -- --SRCS_C=\ -- ../../../../C/Alloc.c \ -- ../../../../C/Ppmd7.c \ -- ../../../../C/Ppmd7Dec.c -- --CRC.o : ../../../Common/CRC.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/CRC.cpp --MyWindows.o : ../../../Common/MyWindows.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyWindows.cpp --MyVector.o : ../../../Common/MyVector.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../../Common/MyVector.cpp --DllExports.o : ../DllExports.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../DllExports.cpp --CodecExports.o : ../CodecExports.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../CodecExports.cpp --InBuffer.o : ../../Common/InBuffer.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/InBuffer.cpp --LzOutWindow.o : ../LzOutWindow.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../LzOutWindow.cpp --StreamUtils.o : ../../Common/StreamUtils.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/StreamUtils.cpp --OutBuffer.o : ../../Common/OutBuffer.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../../Common/OutBuffer.cpp --Rar1Decoder.o : ../Rar1Decoder.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar1Decoder.cpp --Rar2Decoder.o : ../Rar2Decoder.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar2Decoder.cpp --Rar3Decoder.o : ../Rar3Decoder.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Decoder.cpp --Rar3Vm.o : ../Rar3Vm.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../Rar3Vm.cpp --RarCodecsRegister.o : ../RarCodecsRegister.cpp -- $(CXX) $(CC_SHARED) $(CXXFLAGS) ../RarCodecsRegister.cpp --Alloc.o : ../../../../C/Alloc.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Alloc.c --Ppmd7.o : ../../../../C/Ppmd7.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7.c --Ppmd7Dec.o : ../../../../C/Ppmd7Dec.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/Ppmd7Dec.c -- --# CRC32, C version --7zCrc.o : ../../../../C/7zCrc.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrc.c --7zCrcOpt.o : ../../../../C/7zCrcOpt.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcOpt.c --# CRC32, ASM version --7zCrcT8.o : ../../../../C/7zCrcT8.c -- $(CC) $(CC_SHARED) $(CFLAGS) ../../../../C/7zCrcT8.c -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp ---- p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp 2009-12-21 08:46:36.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,480 +0,0 @@ --// Rar1Decoder.cpp --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --#include "StdAfx.h" -- --#include "Rar1Decoder.h" -- --namespace NCompress { --namespace NRar1 { -- --static UInt32 PosL1[]={0,0,0,2,3,5,7,11,16,20,24,32,32, 256}; --static UInt32 PosL2[]={0,0,0,0,5,7,9,13,18,22,26,34,36, 256}; --static UInt32 PosHf0[]={0,0,0,0,0,8,16,24,33,33,33,33,33, 257}; --static UInt32 PosHf1[]={0,0,0,0,0,0,4,44,60,76,80,80,127, 257}; --static UInt32 PosHf2[]={0,0,0,0,0,0,2,7,53,117,233, 257,0}; --static UInt32 PosHf3[]={0,0,0,0,0,0,0,2,16,218,251, 257,0}; --static UInt32 PosHf4[]={0,0,0,0,0,0,0,0,0,255, 257,0,0}; -- --static const UInt32 kHistorySize = (1 << 16); -- --class CCoderReleaser --{ -- CDecoder *m_Coder; --public: -- CCoderReleaser(CDecoder *coder): m_Coder(coder) {} -- ~CCoderReleaser() { m_Coder->ReleaseStreams(); } --}; -- --CDecoder::CDecoder(): m_IsSolid(false) { } -- --void CDecoder::InitStructures() --{ -- for(int i = 0; i < kNumRepDists; i++) -- m_RepDists[i] = 0; -- m_RepDistPtr = 0; -- LastLength = 0; -- LastDist = 0; --} -- --UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.ReadBits(numBits); } -- --HRESULT CDecoder::CopyBlock(UInt32 distance, UInt32 len) --{ -- if (len == 0) -- return S_FALSE; -- m_UnpackSize -= len; -- return m_OutWindowStream.CopyBlock(distance, len) ? S_OK : S_FALSE; --} -- -- --UInt32 CDecoder::DecodeNum(const UInt32 *posTab) --{ -- UInt32 startPos = 2; -- UInt32 num = m_InBitStream.GetValue(12); -- for (;;) -- { -- UInt32 cur = (posTab[startPos + 1] - posTab[startPos]) << (12 - startPos); -- if (num < cur) -- break; -- startPos++; -- num -= cur; -- } -- m_InBitStream.MovePos(startPos); -- return((num >> (12 - startPos)) + posTab[startPos]); --} -- --static Byte kShortLen1[] = {1,3,4,4,5,6,7,8,8,4,4,5,6,6 }; --static Byte kShortLen1a[] = {1,4,4,4,5,6,7,8,8,4,4,5,6,6,4 }; --static Byte kShortLen2[] = {2,3,3,3,4,4,5,6,6,4,4,5,6,6 }; --static Byte kShortLen2a[] = {2,3,3,4,4,4,5,6,6,4,4,5,6,6,4 }; --static UInt32 kShortXor1[] = {0,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff,0xc0,0x80,0x90,0x98,0x9c,0xb0}; --static UInt32 kShortXor2[] = {0,0x40,0x60,0xa0,0xd0,0xe0,0xf0,0xf8,0xfc,0xc0,0x80,0x90,0x98,0x9c,0xb0}; -- --HRESULT CDecoder::ShortLZ() --{ -- UInt32 len, saveLen, dist; -- int distancePlace; -- Byte *kShortLen; -- const UInt32 *kShortXor; -- NumHuf = 0; -- -- if (LCount == 2) -- { -- if (ReadBits(1)) -- return CopyBlock(LastDist, LastLength); -- LCount = 0; -- } -- -- UInt32 bitField = m_InBitStream.GetValue(8); -- -- if (AvrLn1 < 37) -- { -- kShortLen = Buf60 ? kShortLen1a : kShortLen1; -- kShortXor = kShortXor1; -- } -- else -- { -- kShortLen = Buf60 ? kShortLen2a : kShortLen2; -- kShortXor = kShortXor2; -- } -- -- for (len = 0; ((bitField ^ kShortXor[len]) & (~(0xff >> kShortLen[len]))) != 0; len++); -- m_InBitStream.MovePos(kShortLen[len]); -- -- if (len >= 9) -- { -- if (len == 9) -- { -- LCount++; -- return CopyBlock(LastDist, LastLength); -- } -- if (len == 14) -- { -- LCount = 0; -- len = DecodeNum(PosL2) + 5; -- dist = 0x8000 + ReadBits(15) - 1; -- LastLength = len; -- LastDist = dist; -- return CopyBlock(dist, len); -- } -- -- LCount = 0; -- saveLen = len; -- dist = m_RepDists[(m_RepDistPtr - (len - 9)) & 3]; -- len = DecodeNum(PosL1) + 2; -- if (len == 0x101 && saveLen == 10) -- { -- Buf60 ^= 1; -- return S_OK; -- } -- if (dist >= 256) -- len++; -- if (dist >= MaxDist3 - 1) -- len++; -- } -- else -- { -- LCount = 0; -- AvrLn1 += len; -- AvrLn1 -= AvrLn1 >> 4; -- -- distancePlace = DecodeNum(PosHf2) & 0xff; -- dist = ChSetA[distancePlace]; -- if (--distancePlace != -1) -- { -- PlaceA[dist]--; -- UInt32 lastDistance = ChSetA[distancePlace]; -- PlaceA[lastDistance]++; -- ChSetA[distancePlace + 1] = lastDistance; -- ChSetA[distancePlace] = dist; -- } -- len += 2; -- } -- m_RepDists[m_RepDistPtr++] = dist; -- m_RepDistPtr &= 3; -- LastLength = len; -- LastDist = dist; -- return CopyBlock(dist, len); --} -- -- --HRESULT CDecoder::LongLZ() --{ -- UInt32 len; -- UInt32 dist; -- UInt32 distancePlace, newDistancePlace; -- UInt32 oldAvr2, oldAvr3; -- -- NumHuf = 0; -- Nlzb += 16; -- if (Nlzb > 0xff) -- { -- Nlzb = 0x90; -- Nhfb >>= 1; -- } -- oldAvr2=AvrLn2; -- -- if (AvrLn2 >= 122) -- len = DecodeNum(PosL2); -- else if (AvrLn2 >= 64) -- len = DecodeNum(PosL1); -- else -- { -- UInt32 bitField = m_InBitStream.GetValue(16); -- if (bitField < 0x100) -- { -- len = bitField; -- m_InBitStream.MovePos(16); -- } -- else -- { -- for (len = 0; ((bitField << len) & 0x8000) == 0; len++) -- ; -- m_InBitStream.MovePos(len + 1); -- } -- } -- -- AvrLn2 += len; -- AvrLn2 -= AvrLn2 >> 5; -- -- if (AvrPlcB > 0x28ff) -- distancePlace = DecodeNum(PosHf2); -- else if (AvrPlcB > 0x6ff) -- distancePlace = DecodeNum(PosHf1); -- else -- distancePlace = DecodeNum(PosHf0); -- -- AvrPlcB += distancePlace; -- AvrPlcB -= AvrPlcB >> 8; -- for (;;) -- { -- dist = ChSetB[distancePlace & 0xff]; -- newDistancePlace = NToPlB[dist++ & 0xff]++; -- if (!(dist & 0xff)) -- CorrHuff(ChSetB,NToPlB); -- else -- break; -- } -- -- ChSetB[distancePlace] = ChSetB[newDistancePlace]; -- ChSetB[newDistancePlace] = dist; -- -- dist = ((dist & 0xff00) >> 1) | ReadBits(7); -- -- oldAvr3 = AvrLn3; -- if (len != 1 && len != 4) -- if (len == 0 && dist <= MaxDist3) -- { -- AvrLn3++; -- AvrLn3 -= AvrLn3 >> 8; -- } -- else -- if (AvrLn3 > 0) -- AvrLn3--; -- len += 3; -- if (dist >= MaxDist3) -- len++; -- if (dist <= 256) -- len += 8; -- if (oldAvr3 > 0xb0 || AvrPlc >= 0x2a00 && oldAvr2 < 0x40) -- MaxDist3 = 0x7f00; -- else -- MaxDist3 = 0x2001; -- m_RepDists[m_RepDistPtr++] = --dist; -- m_RepDistPtr &= 3; -- LastLength = len; -- LastDist = dist; -- return CopyBlock(dist, len); --} -- -- --HRESULT CDecoder::HuffDecode() --{ -- UInt32 curByte, newBytePlace; -- UInt32 len; -- UInt32 dist; -- int bytePlace; -- -- if (AvrPlc > 0x75ff) bytePlace = DecodeNum(PosHf4); -- else if (AvrPlc > 0x5dff) bytePlace = DecodeNum(PosHf3); -- else if (AvrPlc > 0x35ff) bytePlace = DecodeNum(PosHf2); -- else if (AvrPlc > 0x0dff) bytePlace = DecodeNum(PosHf1); -- else bytePlace = DecodeNum(PosHf0); -- if (StMode) -- { -- if (--bytePlace == -1) -- { -- if (ReadBits(1)) -- { -- NumHuf = StMode = 0; -- return S_OK; -- } -- else -- { -- len = (ReadBits(1)) ? 4 : 3; -- dist = DecodeNum(PosHf2); -- dist = (dist << 5) | ReadBits(5); -- return CopyBlock(dist - 1, len); -- } -- } -- } -- else if (NumHuf++ >= 16 && FlagsCnt == 0) -- StMode = 1; -- bytePlace &= 0xff; -- AvrPlc += bytePlace; -- AvrPlc -= AvrPlc >> 8; -- Nhfb+=16; -- if (Nhfb > 0xff) -- { -- Nhfb=0x90; -- Nlzb >>= 1; -- } -- -- m_UnpackSize --; -- m_OutWindowStream.PutByte((Byte)(ChSet[bytePlace] >> 8)); -- -- for (;;) -- { -- curByte = ChSet[bytePlace]; -- newBytePlace = NToPl[curByte++ & 0xff]++; -- if ((curByte & 0xff) > 0xa1) -- CorrHuff(ChSet, NToPl); -- else -- break; -- } -- -- ChSet[bytePlace] = ChSet[newBytePlace]; -- ChSet[newBytePlace] = curByte; -- return S_OK; --} -- -- --void CDecoder::GetFlagsBuf() --{ -- UInt32 flags, newFlagsPlace; -- UInt32 flagsPlace = DecodeNum(PosHf2); -- -- for (;;) -- { -- flags = ChSetC[flagsPlace]; -- FlagBuf = flags >> 8; -- newFlagsPlace = NToPlC[flags++ & 0xff]++; -- if ((flags & 0xff) != 0) -- break; -- CorrHuff(ChSetC, NToPlC); -- } -- -- ChSetC[flagsPlace] = ChSetC[newFlagsPlace]; -- ChSetC[newFlagsPlace] = flags; --} -- --void CDecoder::InitData() --{ -- if (!m_IsSolid) -- { -- AvrPlcB = AvrLn1 = AvrLn2 = AvrLn3 = NumHuf = Buf60 = 0; -- AvrPlc = 0x3500; -- MaxDist3 = 0x2001; -- Nhfb = Nlzb = 0x80; -- } -- FlagsCnt = 0; -- FlagBuf = 0; -- StMode = 0; -- LCount = 0; --} -- --void CDecoder::CorrHuff(UInt32 *CharSet,UInt32 *NumToPlace) --{ -- int i; -- for (i = 7; i >= 0; i--) -- for (int j = 0; j < 32; j++, CharSet++) -- *CharSet = (*CharSet & ~0xff) | i; -- memset(NumToPlace, 0, sizeof(NToPl)); -- for (i = 6; i >= 0; i--) -- NumToPlace[i] = (7 - i) * 32; --} -- --void CDecoder::InitHuff() --{ -- for (UInt32 i = 0; i < 256; i++) -- { -- Place[i] = PlaceA[i] = PlaceB[i] = i; -- PlaceC[i] = (~i + 1) & 0xff; -- ChSet[i] = ChSetB[i] = i << 8; -- ChSetA[i] = i; -- ChSetC[i] = ((~i + 1) & 0xff) << 8; -- } -- memset(NToPl, 0, sizeof(NToPl)); -- memset(NToPlB, 0, sizeof(NToPlB)); -- memset(NToPlC, 0, sizeof(NToPlC)); -- CorrHuff(ChSetB, NToPlB); --} -- --HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo * /* progress */) --{ -- if (inSize == NULL || outSize == NULL) -- return E_INVALIDARG; -- -- if (!m_OutWindowStream.Create(kHistorySize)) -- return E_OUTOFMEMORY; -- if (!m_InBitStream.Create(1 << 20)) -- return E_OUTOFMEMORY; -- -- m_UnpackSize = (Int64)*outSize; -- m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -- m_InBitStream.SetStream(inStream); -- m_InBitStream.Init(); -- -- CCoderReleaser coderReleaser(this); -- InitData(); -- if (!m_IsSolid) -- { -- InitStructures(); -- InitHuff(); -- } -- if (m_UnpackSize > 0) -- { -- GetFlagsBuf(); -- FlagsCnt = 8; -- } -- -- while (m_UnpackSize > 0) -- { -- if (StMode) -- { -- RINOK(HuffDecode()); -- continue; -- } -- -- if (--FlagsCnt < 0) -- { -- GetFlagsBuf(); -- FlagsCnt=7; -- } -- -- if (FlagBuf & 0x80) -- { -- FlagBuf <<= 1; -- if (Nlzb > Nhfb) -- { -- RINOK(LongLZ()); -- } -- else -- { -- RINOK(HuffDecode()); -- } -- } -- else -- { -- FlagBuf <<= 1; -- if (--FlagsCnt < 0) -- { -- GetFlagsBuf(); -- FlagsCnt = 7; -- } -- if (FlagBuf & 0x80) -- { -- FlagBuf <<= 1; -- if (Nlzb > Nhfb) -- { -- RINOK(HuffDecode()); -- } -- else -- { -- RINOK(LongLZ()); -- } -- } -- else -- { -- FlagBuf <<= 1; -- RINOK(ShortLZ()); -- } -- } -- } -- if (m_UnpackSize < 0) -- return S_FALSE; -- return m_OutWindowStream.Flush(); --} -- --STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) --{ -- try { return CodeReal(inStream, outStream, inSize, outSize, progress); } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(const CLzOutWindowException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } --} -- --STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) --{ -- if (size < 1) -- return E_INVALIDARG; -- m_IsSolid = (data[0] != 0); -- return S_OK; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.h ---- p7zip_9.20.1/CPP/7zip/Compress/Rar1Decoder.h 2009-02-07 15:06:28.000000000 -0200 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar1Decoder.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,88 +0,0 @@ --// Rar1Decoder.h --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --#ifndef __COMPRESS_RAR1_DECODER_H --#define __COMPRESS_RAR1_DECODER_H -- --#include "../../Common/MyCom.h" -- --#include "../ICoder.h" -- --#include "../Common/InBuffer.h" -- --#include "BitmDecoder.h" --#include "HuffmanDecoder.h" --#include "LzOutWindow.h" -- --namespace NCompress { --namespace NRar1 { -- --const UInt32 kNumRepDists = 4; -- --typedef NBitm::CDecoder CBitDecoder; -- --class CDecoder : -- public ICompressCoder, -- public ICompressSetDecoderProperties2, -- public CMyUnknownImp --{ --public: -- CLzOutWindow m_OutWindowStream; -- CBitDecoder m_InBitStream; -- -- UInt32 m_RepDists[kNumRepDists]; -- UInt32 m_RepDistPtr; -- -- UInt32 LastDist; -- UInt32 LastLength; -- -- Int64 m_UnpackSize; -- bool m_IsSolid; -- -- UInt32 ReadBits(int numBits); -- HRESULT CopyBlock(UInt32 distance, UInt32 len); -- -- UInt32 DecodeNum(const UInt32 *posTab); -- HRESULT ShortLZ(); -- HRESULT LongLZ(); -- HRESULT HuffDecode(); -- void GetFlagsBuf(); -- void InitData(); -- void InitHuff(); -- void CorrHuff(UInt32 *CharSet, UInt32 *NumToPlace); -- void OldUnpWriteBuf(); -- -- UInt32 ChSet[256],ChSetA[256],ChSetB[256],ChSetC[256]; -- UInt32 Place[256],PlaceA[256],PlaceB[256],PlaceC[256]; -- UInt32 NToPl[256],NToPlB[256],NToPlC[256]; -- UInt32 FlagBuf,AvrPlc,AvrPlcB,AvrLn1,AvrLn2,AvrLn3; -- int Buf60,NumHuf,StMode,LCount,FlagsCnt; -- UInt32 Nhfb,Nlzb,MaxDist3; -- -- void InitStructures(); -- -- HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); -- --public: -- CDecoder(); -- -- MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2) -- -- void ReleaseStreams() -- { -- m_OutWindowStream.ReleaseStream(); -- m_InBitStream.ReleaseStream(); -- } -- -- STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); -- -- STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); -- --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp ---- p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp 2009-12-21 08:46:36.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,391 +0,0 @@ --// Rar2Decoder.cpp --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --#include "StdAfx.h" -- --#include "Rar2Decoder.h" -- --namespace NCompress { --namespace NRar2 { -- --namespace NMultimedia { -- --Byte CFilter::Decode(int &channelDelta, Byte deltaByte) --{ -- D4 = D3; -- D3 = D2; -- D2 = LastDelta - D1; -- D1 = LastDelta; -- int predictedValue = ((8 * LastChar + K1 * D1 + K2 * D2 + K3 * D3 + K4 * D4 + K5 * channelDelta) >> 3); -- -- Byte realValue = (Byte)(predictedValue - deltaByte); -- int i = ((int)(signed char)deltaByte) << 3; -- -- Dif[0] += abs(i); -- Dif[1] += abs(i - D1); -- Dif[2] += abs(i + D1); -- Dif[3] += abs(i - D2); -- Dif[4] += abs(i + D2); -- Dif[5] += abs(i - D3); -- Dif[6] += abs(i + D3); -- Dif[7] += abs(i - D4); -- Dif[8] += abs(i + D4); -- Dif[9] += abs(i - channelDelta); -- Dif[10] += abs(i + channelDelta); -- -- channelDelta = LastDelta = (signed char)(realValue - LastChar); -- LastChar = realValue; -- -- if (((++ByteCount) & 0x1F) == 0) -- { -- UInt32 minDif = Dif[0]; -- UInt32 numMinDif = 0; -- Dif[0] = 0; -- for (i = 1; i < sizeof(Dif) / sizeof(Dif[0]); i++) -- { -- if (Dif[i] < minDif) -- { -- minDif = Dif[i]; -- numMinDif = i; -- } -- Dif[i] = 0; -- } -- switch(numMinDif) -- { -- case 1: if (K1 >= -16) K1--; break; -- case 2: if (K1 < 16) K1++; break; -- case 3: if (K2 >= -16) K2--; break; -- case 4: if (K2 < 16) K2++; break; -- case 5: if (K3 >= -16) K3--; break; -- case 6: if (K3 < 16) K3++; break; -- case 7: if (K4 >= -16) K4--; break; -- case 8: if (K4 < 16) K4++; break; -- case 9: if (K5 >= -16) K5--; break; -- case 10:if (K5 < 16) K5++; break; -- } -- } -- return realValue; --} --} -- --static const char *kNumberErrorMessage = "Number error"; -- --static const UInt32 kHistorySize = 1 << 20; -- --static const int kNumStats = 11; -- --static const UInt32 kWindowReservSize = (1 << 22) + 256; -- --CDecoder::CDecoder(): -- m_IsSolid(false) --{ --} -- --void CDecoder::InitStructures() --{ -- m_MmFilter.Init(); -- for(int i = 0; i < kNumRepDists; i++) -- m_RepDists[i] = 0; -- m_RepDistPtr = 0; -- m_LastLength = 0; -- memset(m_LastLevels, 0, kMaxTableSize); --} -- --UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.ReadBits(numBits); } -- --#define RIF(x) { if (!(x)) return false; } -- --bool CDecoder::ReadTables(void) --{ -- Byte levelLevels[kLevelTableSize]; -- Byte newLevels[kMaxTableSize]; -- m_AudioMode = (ReadBits(1) == 1); -- -- if (ReadBits(1) == 0) -- memset(m_LastLevels, 0, kMaxTableSize); -- int numLevels; -- if (m_AudioMode) -- { -- m_NumChannels = ReadBits(2) + 1; -- if (m_MmFilter.CurrentChannel >= m_NumChannels) -- m_MmFilter.CurrentChannel = 0; -- numLevels = m_NumChannels * kMMTableSize; -- } -- else -- numLevels = kHeapTablesSizesSum; -- -- int i; -- for (i = 0; i < kLevelTableSize; i++) -- levelLevels[i] = (Byte)ReadBits(4); -- RIF(m_LevelDecoder.SetCodeLengths(levelLevels)); -- i = 0; -- while (i < numLevels) -- { -- UInt32 number = m_LevelDecoder.DecodeSymbol(&m_InBitStream); -- if (number < kTableDirectLevels) -- { -- newLevels[i] = (Byte)((number + m_LastLevels[i]) & kLevelMask); -- i++; -- } -- else -- { -- if (number == kTableLevelRepNumber) -- { -- int t = ReadBits(2) + 3; -- for (int reps = t; reps > 0 && i < numLevels ; reps--, i++) -- newLevels[i] = newLevels[i - 1]; -- } -- else -- { -- int num; -- if (number == kTableLevel0Number) -- num = ReadBits(3) + 3; -- else if (number == kTableLevel0Number2) -- num = ReadBits(7) + 11; -- else -- return false; -- for (;num > 0 && i < numLevels; num--) -- newLevels[i++] = 0; -- } -- } -- } -- if (m_AudioMode) -- for (i = 0; i < m_NumChannels; i++) -- { -- RIF(m_MMDecoders[i].SetCodeLengths(&newLevels[i * kMMTableSize])); -- } -- else -- { -- RIF(m_MainDecoder.SetCodeLengths(&newLevels[0])); -- RIF(m_DistDecoder.SetCodeLengths(&newLevels[kMainTableSize])); -- RIF(m_LenDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize])); -- } -- memcpy(m_LastLevels, newLevels, kMaxTableSize); -- return true; --} -- --bool CDecoder::ReadLastTables() --{ -- // it differs a little from pure RAR sources; -- // UInt64 ttt = m_InBitStream.GetProcessedSize() + 2; -- // + 2 works for: return 0xFF; in CInBuffer::ReadByte. -- if (m_InBitStream.GetProcessedSize() + 7 <= m_PackSize) // test it: probably incorrect; -- // if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect; -- if (m_AudioMode) -- { -- UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream); -- if (symbol == 256) -- return ReadTables(); -- if (symbol >= kMMTableSize) -- return false; -- } -- else -- { -- UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream); -- if (number == kReadTableNumber) -- return ReadTables(); -- if (number >= kMainTableSize) -- return false; -- } -- return true; --} -- --class CCoderReleaser --{ -- CDecoder *m_Coder; --public: -- CCoderReleaser(CDecoder *coder): m_Coder(coder) {} -- ~CCoderReleaser() -- { -- m_Coder->ReleaseStreams(); -- } --}; -- --bool CDecoder::DecodeMm(UInt32 pos) --{ -- while (pos-- > 0) -- { -- UInt32 symbol = m_MMDecoders[m_MmFilter.CurrentChannel].DecodeSymbol(&m_InBitStream); -- if (symbol == 256) -- return true; -- if (symbol >= kMMTableSize) -- return false; -- /* -- Byte byPredict = m_Predictor.Predict(); -- Byte byReal = (Byte)(byPredict - (Byte)symbol); -- m_Predictor.Update(byReal, byPredict); -- */ -- Byte byReal = m_MmFilter.Decode((Byte)symbol); -- m_OutWindowStream.PutByte(byReal); -- if (++m_MmFilter.CurrentChannel == m_NumChannels) -- m_MmFilter.CurrentChannel = 0; -- } -- return true; --} -- --bool CDecoder::DecodeLz(Int32 pos) --{ -- while (pos > 0) -- { -- UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream); -- UInt32 length, distance; -- if (number < 256) -- { -- m_OutWindowStream.PutByte(Byte(number)); -- pos--; -- continue; -- } -- else if (number >= kMatchNumber) -- { -- number -= kMatchNumber; -- length = kNormalMatchMinLen + UInt32(kLenStart[number]) + -- m_InBitStream.ReadBits(kLenDirectBits[number]); -- number = m_DistDecoder.DecodeSymbol(&m_InBitStream); -- if (number >= kDistTableSize) -- return false; -- distance = kDistStart[number] + m_InBitStream.ReadBits(kDistDirectBits[number]); -- if (distance >= kDistLimit3) -- { -- length += 2 - ((distance - kDistLimit4) >> 31); -- // length++; -- // if (distance >= kDistLimit4) -- // length++; -- } -- } -- else if (number == kRepBothNumber) -- { -- length = m_LastLength; -- if (length == 0) -- return false; -- distance = m_RepDists[(m_RepDistPtr + 4 - 1) & 3]; -- } -- else if (number < kLen2Number) -- { -- distance = m_RepDists[(m_RepDistPtr - (number - kRepNumber + 1)) & 3]; -- number = m_LenDecoder.DecodeSymbol(&m_InBitStream); -- if (number >= kLenTableSize) -- return false; -- length = 2 + kLenStart[number] + m_InBitStream.ReadBits(kLenDirectBits[number]); -- if (distance >= kDistLimit2) -- { -- length++; -- if (distance >= kDistLimit3) -- { -- length += 2 - ((distance - kDistLimit4) >> 31); -- // length++; -- // if (distance >= kDistLimit4) -- // length++; -- } -- } -- } -- else if (number < kReadTableNumber) -- { -- number -= kLen2Number; -- distance = kLen2DistStarts[number] + -- m_InBitStream.ReadBits(kLen2DistDirectBits[number]); -- length = 2; -- } -- else if (number == kReadTableNumber) -- return true; -- else -- return false; -- m_RepDists[m_RepDistPtr++ & 3] = distance; -- m_LastLength = length; -- if (!m_OutWindowStream.CopyBlock(distance, length)) -- return false; -- pos -= length; -- } -- return true; --} -- --HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) --{ -- if (inSize == NULL || outSize == NULL) -- return E_INVALIDARG; -- -- if (!m_OutWindowStream.Create(kHistorySize)) -- return E_OUTOFMEMORY; -- if (!m_InBitStream.Create(1 << 20)) -- return E_OUTOFMEMORY; -- -- m_PackSize = *inSize; -- -- UInt64 pos = 0, unPackSize = *outSize; -- -- m_OutWindowStream.SetStream(outStream); -- m_OutWindowStream.Init(m_IsSolid); -- m_InBitStream.SetStream(inStream); -- m_InBitStream.Init(); -- -- CCoderReleaser coderReleaser(this); -- if (!m_IsSolid) -- { -- InitStructures(); -- if (unPackSize == 0) -- { -- if (m_InBitStream.GetProcessedSize() + 2 <= m_PackSize) // test it: probably incorrect; -- if (!ReadTables()) -- return S_FALSE; -- return S_OK; -- } -- if (!ReadTables()) -- return S_FALSE; -- } -- -- UInt64 startPos = m_OutWindowStream.GetProcessedSize(); -- while(pos < unPackSize) -- { -- UInt32 blockSize = 1 << 20; -- if (blockSize > unPackSize - pos) -- blockSize = (UInt32)(unPackSize - pos); -- UInt64 blockStartPos = m_OutWindowStream.GetProcessedSize(); -- if (m_AudioMode) -- { -- if (!DecodeMm(blockSize)) -- return S_FALSE; -- } -- else -- { -- if (!DecodeLz((Int32)blockSize)) -- return S_FALSE; -- } -- UInt64 globalPos = m_OutWindowStream.GetProcessedSize(); -- pos = globalPos - blockStartPos; -- if (pos < blockSize) -- if (!ReadTables()) -- return S_FALSE; -- pos = globalPos - startPos; -- if (progress != 0) -- { -- UInt64 packSize = m_InBitStream.GetProcessedSize(); -- RINOK(progress->SetRatioInfo(&packSize, &pos)); -- } -- } -- if (pos > unPackSize) -- return S_FALSE; -- -- if (!ReadLastTables()) -- return S_FALSE; -- return m_OutWindowStream.Flush(); --} -- --STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) --{ -- try { return CodeReal(inStream, outStream, inSize, outSize, progress); } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(const CLzOutWindowException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } --} -- --STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) --{ -- if (size < 1) -- return E_INVALIDARG; -- m_IsSolid = (data[0] != 0); -- return S_OK; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.h ---- p7zip_9.20.1/CPP/7zip/Compress/Rar2Decoder.h 2009-02-07 15:06:28.000000000 -0200 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar2Decoder.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,174 +0,0 @@ --// Rar2Decoder.h --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --#ifndef __COMPRESS_RAR2_DECODER_H --#define __COMPRESS_RAR2_DECODER_H -- --#include "../../Common/MyCom.h" -- --#include "../ICoder.h" -- --#include "../Common/InBuffer.h" -- --#include "BitmDecoder.h" --#include "HuffmanDecoder.h" --#include "LzOutWindow.h" -- --namespace NCompress { --namespace NRar2 { -- --const UInt32 kNumRepDists = 4; --const UInt32 kDistTableSize = 48; -- --const int kMMTableSize = 256 + 1; -- --const UInt32 kMainTableSize = 298; --const UInt32 kLenTableSize = 28; -- --const UInt32 kDistTableStart = kMainTableSize; --const UInt32 kLenTableStart = kDistTableStart + kDistTableSize; -- --const UInt32 kHeapTablesSizesSum = kMainTableSize + kDistTableSize + kLenTableSize; -- --const UInt32 kLevelTableSize = 19; -- --const UInt32 kMMTablesSizesSum = kMMTableSize * 4; -- --const UInt32 kMaxTableSize = kMMTablesSizesSum; -- --const UInt32 kTableDirectLevels = 16; --const UInt32 kTableLevelRepNumber = kTableDirectLevels; --const UInt32 kTableLevel0Number = kTableLevelRepNumber + 1; --const UInt32 kTableLevel0Number2 = kTableLevel0Number + 1; -- --const UInt32 kLevelMask = 0xF; -- -- --const UInt32 kRepBothNumber = 256; --const UInt32 kRepNumber = kRepBothNumber + 1; --const UInt32 kLen2Number = kRepNumber + 4; -- --const UInt32 kLen2NumNumbers = 8; --const UInt32 kReadTableNumber = kLen2Number + kLen2NumNumbers; --const UInt32 kMatchNumber = kReadTableNumber + 1; -- --const Byte kLenStart[kLenTableSize] = {0,1,2,3,4,5,6,7,8,10,12,14,16,20,24,28,32,40,48,56,64,80,96,112,128,160,192,224}; --const Byte kLenDirectBits[kLenTableSize] = {0,0,0,0,0,0,0,0,1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5}; -- --const UInt32 kDistStart[kDistTableSize] = {0,1,2,3,4,6,8,12,16,24,32,48,64,96,128,192,256,384,512,768,1024,1536,2048,3072,4096,6144,8192,12288,16384,24576,32768U,49152U,65536,98304,131072,196608,262144,327680,393216,458752,524288,589824,655360,720896,786432,851968,917504,983040}; --const Byte kDistDirectBits[kDistTableSize] = {0,0,0,0,1,1,2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16}; -- --const Byte kLevelDirectBits[kLevelTableSize] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7}; -- --const Byte kLen2DistStarts[kLen2NumNumbers]={0,4,8,16,32,64,128,192}; --const Byte kLen2DistDirectBits[kLen2NumNumbers]={2,2,3, 4, 5, 6, 6, 6}; -- --const UInt32 kDistLimit2 = 0x101 - 1; --const UInt32 kDistLimit3 = 0x2000 - 1; --const UInt32 kDistLimit4 = 0x40000 - 1; -- --const UInt32 kMatchMaxLen = 255 + 2; --const UInt32 kMatchMaxLenMax = 255 + 5; --const UInt32 kNormalMatchMinLen = 3; -- --namespace NMultimedia { -- --struct CFilter --{ -- int K1,K2,K3,K4,K5; -- int D1,D2,D3,D4; -- int LastDelta; -- UInt32 Dif[11]; -- UInt32 ByteCount; -- int LastChar; -- -- Byte Decode(int &channelDelta, Byte delta); -- -- void Init() { memset(this, 0, sizeof(*this)); } -- --}; -- --const int kNumChanelsMax = 4; -- --class CFilter2 --{ --public: -- CFilter m_Filters[kNumChanelsMax]; -- int m_ChannelDelta; -- int CurrentChannel; -- -- void Init() { memset(this, 0, sizeof(*this)); } -- Byte Decode(Byte delta) -- { -- return m_Filters[CurrentChannel].Decode(m_ChannelDelta, delta); -- } -- --}; -- --} -- --typedef NBitm::CDecoder CBitDecoder; -- --const int kNumHuffmanBits = 15; -- --class CDecoder : -- public ICompressCoder, -- public ICompressSetDecoderProperties2, -- public CMyUnknownImp --{ -- CLzOutWindow m_OutWindowStream; -- CBitDecoder m_InBitStream; -- NHuffman::CDecoder m_MainDecoder; -- NHuffman::CDecoder m_DistDecoder; -- NHuffman::CDecoder m_LenDecoder; -- NHuffman::CDecoder m_MMDecoders[NMultimedia::kNumChanelsMax]; -- NHuffman::CDecoder m_LevelDecoder; -- -- bool m_AudioMode; -- -- NMultimedia::CFilter2 m_MmFilter; -- int m_NumChannels; -- -- UInt32 m_RepDists[kNumRepDists]; -- UInt32 m_RepDistPtr; -- -- UInt32 m_LastLength; -- -- Byte m_LastLevels[kMaxTableSize]; -- -- UInt64 m_PackSize; -- bool m_IsSolid; -- -- void InitStructures(); -- UInt32 ReadBits(int numBits); -- bool ReadTables(); -- bool ReadLastTables(); -- -- bool DecodeMm(UInt32 pos); -- bool DecodeLz(Int32 pos); -- -- HRESULT CodeReal(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); -- --public: -- CDecoder(); -- -- MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2) -- -- void ReleaseStreams() -- { -- m_OutWindowStream.ReleaseStream(); -- m_InBitStream.ReleaseStream(); -- } -- -- STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); -- -- STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); -- --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp ---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp 2010-09-14 16:18:38.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,897 +0,0 @@ --// Rar3Decoder.cpp --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --/* This code uses Carryless rangecoder (1999): Dmitry Subbotin : Public domain */ -- --#include "StdAfx.h" -- --#include "../../../C/Alloc.h" -- --#include "../Common/StreamUtils.h" -- --#include "Rar3Decoder.h" -- --namespace NCompress { --namespace NRar3 { -- --static void *SzBigAlloc(void *, size_t size) { return BigAlloc(size); } --static void SzBigFree(void *, void *address) { BigFree(address); } --static ISzAlloc g_BigAlloc = { SzBigAlloc, SzBigFree }; -- --static const UInt32 kNumAlignReps = 15; -- --static const UInt32 kSymbolReadTable = 256; --static const UInt32 kSymbolRep = 259; --static const UInt32 kSymbolLen2 = kSymbolRep + kNumReps; -- --static const Byte kLenStart[kLenTableSize] = {0,1,2,3,4,5,6,7,8,10,12,14,16,20,24,28,32,40,48,56,64,80,96,112,128,160,192,224}; --static const Byte kLenDirectBits[kLenTableSize] = {0,0,0,0,0,0,0,0,1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5}; -- --static const Byte kDistDirectBits[kDistTableSize] = -- {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13,14,14,15,15, -- 16,16,16,16,16,16,16,16,16,16,16,16,16,16, -- 18,18,18,18,18,18,18,18,18,18,18,18}; -- --static const Byte kLevelDirectBits[kLevelTableSize] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; -- --static const Byte kLen2DistStarts[kNumLen2Symbols]={0,4,8,16,32,64,128,192}; --static const Byte kLen2DistDirectBits[kNumLen2Symbols]={2,2,3, 4, 5, 6, 6, 6}; -- --static const UInt32 kDistLimit3 = 0x2000 - 2; --static const UInt32 kDistLimit4 = 0x40000 - 2; -- --static const UInt32 kNormalMatchMinLen = 3; -- --static const UInt32 kVmDataSizeMax = 1 << 16; --static const UInt32 kVmCodeSizeMax = 1 << 16; -- --extern "C" { -- --static UInt32 Range_GetThreshold(void *pp, UInt32 total) --{ -- CRangeDecoder *p = (CRangeDecoder *)pp; -- return p->Code / (p->Range /= total); --} -- --static void Range_Decode(void *pp, UInt32 start, UInt32 size) --{ -- CRangeDecoder *p = (CRangeDecoder *)pp; -- start *= p->Range; -- p->Low += start; -- p->Code -= start; -- p->Range *= size; -- p->Normalize(); --} -- --static UInt32 Range_DecodeBit(void *pp, UInt32 size0) --{ -- CRangeDecoder *p = (CRangeDecoder *)pp; -- if (p->Code / (p->Range >>= 14) < size0) -- { -- Range_Decode(p, 0, size0); -- return 0; -- } -- else -- { -- Range_Decode(p, size0, (1 << 14) - size0); -- return 1; -- } --} -- --} -- --CRangeDecoder::CRangeDecoder() --{ -- s.GetThreshold = Range_GetThreshold; -- s.Decode = Range_Decode; -- s.DecodeBit = Range_DecodeBit; --} -- --CDecoder::CDecoder(): -- _window(0), -- _winPos(0), -- _wrPtr(0), -- _lzSize(0), -- _writtenFileSize(0), -- _vmData(0), -- _vmCode(0), -- m_IsSolid(false) --{ -- Ppmd7_Construct(&_ppmd); --} -- --CDecoder::~CDecoder() --{ -- InitFilters(); -- ::MidFree(_vmData); -- ::MidFree(_window); -- Ppmd7_Free(&_ppmd, &g_BigAlloc); --} -- --HRESULT CDecoder::WriteDataToStream(const Byte *data, UInt32 size) --{ -- return WriteStream(_outStream, data, size); --} -- --HRESULT CDecoder::WriteData(const Byte *data, UInt32 size) --{ -- HRESULT res = S_OK; -- if (_writtenFileSize < _unpackSize) -- { -- UInt32 curSize = size; -- UInt64 remain = _unpackSize - _writtenFileSize; -- if (remain < curSize) -- curSize = (UInt32)remain; -- res = WriteDataToStream(data, curSize); -- } -- _writtenFileSize += size; -- return res; --} -- --HRESULT CDecoder::WriteArea(UInt32 startPtr, UInt32 endPtr) --{ -- if (startPtr <= endPtr) -- return WriteData(_window + startPtr, endPtr - startPtr); -- RINOK(WriteData(_window + startPtr, kWindowSize - startPtr)); -- return WriteData(_window, endPtr); --} -- --void CDecoder::ExecuteFilter(int tempFilterIndex, NVm::CBlockRef &outBlockRef) --{ -- CTempFilter *tempFilter = _tempFilters[tempFilterIndex]; -- tempFilter->InitR[6] = (UInt32)_writtenFileSize; -- NVm::SetValue32(&tempFilter->GlobalData[0x24], (UInt32)_writtenFileSize); -- NVm::SetValue32(&tempFilter->GlobalData[0x28], (UInt32)(_writtenFileSize >> 32)); -- CFilter *filter = _filters[tempFilter->FilterIndex]; -- _vm.Execute(filter, tempFilter, outBlockRef, filter->GlobalData); -- delete tempFilter; -- _tempFilters[tempFilterIndex] = 0; --} -- --HRESULT CDecoder::WriteBuf() --{ -- UInt32 writtenBorder = _wrPtr; -- UInt32 writeSize = (_winPos - writtenBorder) & kWindowMask; -- for (int i = 0; i < _tempFilters.Size(); i++) -- { -- CTempFilter *filter = _tempFilters[i]; -- if (filter == NULL) -- continue; -- if (filter->NextWindow) -- { -- filter->NextWindow = false; -- continue; -- } -- UInt32 blockStart = filter->BlockStart; -- UInt32 blockSize = filter->BlockSize; -- if (((blockStart - writtenBorder) & kWindowMask) < writeSize) -- { -- if (writtenBorder != blockStart) -- { -- RINOK(WriteArea(writtenBorder, blockStart)); -- writtenBorder = blockStart; -- writeSize = (_winPos - writtenBorder) & kWindowMask; -- } -- if (blockSize <= writeSize) -- { -- UInt32 blockEnd = (blockStart + blockSize) & kWindowMask; -- if (blockStart < blockEnd || blockEnd == 0) -- _vm.SetMemory(0, _window + blockStart, blockSize); -- else -- { -- UInt32 tailSize = kWindowSize - blockStart; -- _vm.SetMemory(0, _window + blockStart, tailSize); -- _vm.SetMemory(tailSize, _window, blockEnd); -- } -- NVm::CBlockRef outBlockRef; -- ExecuteFilter(i, outBlockRef); -- while (i + 1 < _tempFilters.Size()) -- { -- CTempFilter *nextFilter = _tempFilters[i + 1]; -- if (nextFilter == NULL || nextFilter->BlockStart != blockStart || -- nextFilter->BlockSize != outBlockRef.Size || nextFilter->NextWindow) -- break; -- _vm.SetMemory(0, _vm.GetDataPointer(outBlockRef.Offset), outBlockRef.Size); -- ExecuteFilter(++i, outBlockRef); -- } -- WriteDataToStream(_vm.GetDataPointer(outBlockRef.Offset), outBlockRef.Size); -- _writtenFileSize += outBlockRef.Size; -- writtenBorder = blockEnd; -- writeSize = (_winPos - writtenBorder) & kWindowMask; -- } -- else -- { -- for (int j = i; j < _tempFilters.Size(); j++) -- { -- CTempFilter *filter = _tempFilters[j]; -- if (filter != NULL && filter->NextWindow) -- filter->NextWindow = false; -- } -- _wrPtr = writtenBorder; -- return S_OK; // check it -- } -- } -- } -- -- _wrPtr = _winPos; -- return WriteArea(writtenBorder, _winPos); --} -- --void CDecoder::InitFilters() --{ -- _lastFilter = 0; -- int i; -- for (i = 0; i < _tempFilters.Size(); i++) -- delete _tempFilters[i]; -- _tempFilters.Clear(); -- for (i = 0; i < _filters.Size(); i++) -- delete _filters[i]; -- _filters.Clear(); --} -- --bool CDecoder::AddVmCode(UInt32 firstByte, UInt32 codeSize) --{ -- CMemBitDecoder inp; -- inp.Init(_vmData, codeSize); -- -- UInt32 filterIndex; -- if (firstByte & 0x80) -- { -- filterIndex = NVm::ReadEncodedUInt32(inp); -- if (filterIndex == 0) -- InitFilters(); -- else -- filterIndex--; -- } -- else -- filterIndex = _lastFilter; -- if (filterIndex > (UInt32)_filters.Size()) -- return false; -- _lastFilter = filterIndex; -- bool newFilter = (filterIndex == (UInt32)_filters.Size()); -- -- CFilter *filter; -- if (newFilter) -- { -- // check if too many filters -- if (filterIndex > 1024) -- return false; -- filter = new CFilter; -- _filters.Add(filter); -- } -- else -- { -- filter = _filters[filterIndex]; -- filter->ExecCount++; -- } -- -- int numEmptyItems = 0; -- int i; -- for (i = 0; i < _tempFilters.Size(); i++) -- { -- _tempFilters[i - numEmptyItems] = _tempFilters[i]; -- if (_tempFilters[i] == NULL) -- numEmptyItems++; -- if (numEmptyItems > 0) -- _tempFilters[i] = NULL; -- } -- if (numEmptyItems == 0) -- { -- _tempFilters.Add(NULL); -- numEmptyItems = 1; -- } -- CTempFilter *tempFilter = new CTempFilter; -- _tempFilters[_tempFilters.Size() - numEmptyItems] = tempFilter; -- tempFilter->FilterIndex = filterIndex; -- tempFilter->ExecCount = filter->ExecCount; -- -- UInt32 blockStart = NVm::ReadEncodedUInt32(inp); -- if (firstByte & 0x40) -- blockStart += 258; -- tempFilter->BlockStart = (blockStart + _winPos) & kWindowMask; -- if (firstByte & 0x20) -- filter->BlockSize = NVm::ReadEncodedUInt32(inp); -- tempFilter->BlockSize = filter->BlockSize; -- tempFilter->NextWindow = _wrPtr != _winPos && ((_wrPtr - _winPos) & kWindowMask) <= blockStart; -- -- memset(tempFilter->InitR, 0, sizeof(tempFilter->InitR)); -- tempFilter->InitR[3] = NVm::kGlobalOffset; -- tempFilter->InitR[4] = tempFilter->BlockSize; -- tempFilter->InitR[5] = tempFilter->ExecCount; -- if (firstByte & 0x10) -- { -- UInt32 initMask = inp.ReadBits(NVm::kNumGpRegs); -- for (int i = 0; i < NVm::kNumGpRegs; i++) -- if (initMask & (1 << i)) -- tempFilter->InitR[i] = NVm::ReadEncodedUInt32(inp); -- } -- if (newFilter) -- { -- UInt32 vmCodeSize = NVm::ReadEncodedUInt32(inp); -- if (vmCodeSize >= kVmCodeSizeMax || vmCodeSize == 0) -- return false; -- for (UInt32 i = 0; i < vmCodeSize; i++) -- _vmCode[i] = (Byte)inp.ReadBits(8); -- _vm.PrepareProgram(_vmCode, vmCodeSize, filter); -- } -- -- tempFilter->AllocateEmptyFixedGlobal(); -- -- Byte *globalData = &tempFilter->GlobalData[0]; -- for (i = 0; i < NVm::kNumGpRegs; i++) -- NVm::SetValue32(&globalData[i * 4], tempFilter->InitR[i]); -- NVm::SetValue32(&globalData[NVm::NGlobalOffset::kBlockSize], tempFilter->BlockSize); -- NVm::SetValue32(&globalData[NVm::NGlobalOffset::kBlockPos], 0); // It was commented. why? -- NVm::SetValue32(&globalData[NVm::NGlobalOffset::kExecCount], tempFilter->ExecCount); -- -- if (firstByte & 8) -- { -- UInt32 dataSize = NVm::ReadEncodedUInt32(inp); -- if (dataSize > NVm::kGlobalSize - NVm::kFixedGlobalSize) -- return false; -- CRecordVector &globalData = tempFilter->GlobalData; -- int requredSize = (int)(dataSize + NVm::kFixedGlobalSize); -- if (globalData.Size() < requredSize) -- { -- globalData.Reserve(requredSize); -- for (; globalData.Size() < requredSize; i++) -- globalData.Add(0); -- } -- for (UInt32 i = 0; i < dataSize; i++) -- globalData[NVm::kFixedGlobalSize + i] = (Byte)inp.ReadBits(8); -- } -- return true; --} -- --bool CDecoder::ReadVmCodeLZ() --{ -- UInt32 firstByte = ReadBits(8); -- UInt32 length = (firstByte & 7) + 1; -- if (length == 7) -- length = ReadBits(8) + 7; -- else if (length == 8) -- length = ReadBits(16); -- if (length > kVmDataSizeMax) -- return false; -- for (UInt32 i = 0; i < length; i++) -- _vmData[i] = (Byte)ReadBits(8); -- return AddVmCode(firstByte, length); --} -- --bool CDecoder::ReadVmCodePPM() --{ -- int firstByte = DecodePpmSymbol(); -- if (firstByte < 0) -- return false; -- UInt32 length = (firstByte & 7) + 1; -- if (length == 7) -- { -- int b1 = DecodePpmSymbol(); -- if (b1 < 0) -- return false; -- length = b1 + 7; -- } -- else if (length == 8) -- { -- int b1 = DecodePpmSymbol(); -- if (b1 < 0) -- return false; -- int b2 = DecodePpmSymbol(); -- if (b2 < 0) -- return false; -- length = b1 * 256 + b2; -- } -- if (length > kVmDataSizeMax) -- return false; -- for (UInt32 i = 0; i < length; i++) -- { -- int b = DecodePpmSymbol(); -- if (b < 0) -- return false; -- _vmData[i] = (Byte)b; -- } -- return AddVmCode(firstByte, length); --} -- --#define RIF(x) { if (!(x)) return S_FALSE; } -- --UInt32 CDecoder::ReadBits(int numBits) { return m_InBitStream.bitDecoder.ReadBits(numBits); } -- --///////////////////////////////////////////////// --// PPM -- --HRESULT CDecoder::InitPPM() --{ -- Byte maxOrder = (Byte)ReadBits(7); -- -- bool reset = ((maxOrder & 0x20) != 0); -- int maxMB = 0; -- if (reset) -- maxMB = (Byte)ReadBits(8); -- else -- { -- if (PpmError || !Ppmd7_WasAllocated(&_ppmd)) -- return S_FALSE; -- } -- if (maxOrder & 0x40) -- PpmEscChar = (Byte)ReadBits(8); -- m_InBitStream.InitRangeCoder(); -- /* -- if (m_InBitStream.m_BitPos != 0) -- return S_FALSE; -- */ -- if (reset) -- { -- PpmError = true; -- maxOrder = (maxOrder & 0x1F) + 1; -- if (maxOrder > 16) -- maxOrder = 16 + (maxOrder - 16) * 3; -- if (maxOrder == 1) -- { -- Ppmd7_Free(&_ppmd, &g_BigAlloc); -- return S_FALSE; -- } -- if (!Ppmd7_Alloc(&_ppmd, (maxMB + 1) << 20, &g_BigAlloc)) -- return E_OUTOFMEMORY; -- Ppmd7_Init(&_ppmd, maxOrder); -- PpmError = false; -- } -- return S_OK; --} -- --int CDecoder::DecodePpmSymbol() { return Ppmd7_DecodeSymbol(&_ppmd, &m_InBitStream.s); } -- --HRESULT CDecoder::DecodePPM(Int32 num, bool &keepDecompressing) --{ -- keepDecompressing = false; -- if (PpmError) -- return S_FALSE; -- do -- { -- if (((_wrPtr - _winPos) & kWindowMask) < 260 && _wrPtr != _winPos) -- { -- RINOK(WriteBuf()); -- if (_writtenFileSize > _unpackSize) -- { -- keepDecompressing = false; -- return S_OK; -- } -- } -- int c = DecodePpmSymbol(); -- if (c < 0) -- { -- PpmError = true; -- return S_FALSE; -- } -- if (c == PpmEscChar) -- { -- int nextCh = DecodePpmSymbol(); -- if (nextCh < 0) -- { -- PpmError = true; -- return S_FALSE; -- } -- if (nextCh == 0) -- return ReadTables(keepDecompressing); -- if (nextCh == 2 || nextCh == -1) -- return S_OK; -- if (nextCh == 3) -- { -- if (!ReadVmCodePPM()) -- { -- PpmError = true; -- return S_FALSE; -- } -- continue; -- } -- if (nextCh == 4 || nextCh == 5) -- { -- UInt32 distance = 0; -- UInt32 length = 4; -- if (nextCh == 4) -- { -- for (int i = 0; i < 3; i++) -- { -- int c = DecodePpmSymbol(); -- if (c < 0) -- { -- PpmError = true; -- return S_FALSE; -- } -- distance = (distance << 8) + (Byte)c; -- } -- distance++; -- length += 28; -- } -- int c = DecodePpmSymbol(); -- if (c < 0) -- { -- PpmError = true; -- return S_FALSE; -- } -- length += c; -- if (distance >= _lzSize) -- return S_FALSE; -- CopyBlock(distance, length); -- num -= (Int32)length; -- continue; -- } -- } -- PutByte((Byte)c); -- num--; -- } -- while (num >= 0); -- keepDecompressing = true; -- return S_OK; --} -- --///////////////////////////////////////////////// --// LZ -- --HRESULT CDecoder::ReadTables(bool &keepDecompressing) --{ -- keepDecompressing = true; -- ReadBits((8 - m_InBitStream.bitDecoder.GetBitPosition()) & 7); -- if (ReadBits(1) != 0) -- { -- _lzMode = false; -- return InitPPM(); -- } -- -- _lzMode = true; -- PrevAlignBits = 0; -- PrevAlignCount = 0; -- -- Byte levelLevels[kLevelTableSize]; -- Byte newLevels[kTablesSizesSum]; -- -- if (ReadBits(1) == 0) -- memset(m_LastLevels, 0, kTablesSizesSum); -- -- int i; -- for (i = 0; i < kLevelTableSize; i++) -- { -- UInt32 length = ReadBits(4); -- if (length == 15) -- { -- UInt32 zeroCount = ReadBits(4); -- if (zeroCount != 0) -- { -- zeroCount += 2; -- while (zeroCount-- > 0 && i < kLevelTableSize) -- levelLevels[i++]=0; -- i--; -- continue; -- } -- } -- levelLevels[i] = (Byte)length; -- } -- RIF(m_LevelDecoder.SetCodeLengths(levelLevels)); -- i = 0; -- while (i < kTablesSizesSum) -- { -- UInt32 number = m_LevelDecoder.DecodeSymbol(&m_InBitStream.bitDecoder); -- if (number < 16) -- { -- newLevels[i] = Byte((number + m_LastLevels[i]) & 15); -- i++; -- } -- else if (number > kLevelTableSize) -- return S_FALSE; -- else -- { -- int num; -- if (((number - 16) & 1) == 0) -- num = ReadBits(3) + 3; -- else -- num = ReadBits(7) + 11; -- if (number < 18) -- { -- if (i == 0) -- return S_FALSE; -- for (; num > 0 && i < kTablesSizesSum; num--, i++) -- newLevels[i] = newLevels[i - 1]; -- } -- else -- { -- for (; num > 0 && i < kTablesSizesSum; num--) -- newLevels[i++] = 0; -- } -- } -- } -- TablesRead = true; -- -- // original code has check here: -- /* -- if (InAddr > ReadTop) -- { -- keepDecompressing = false; -- return true; -- } -- */ -- -- RIF(m_MainDecoder.SetCodeLengths(&newLevels[0])); -- RIF(m_DistDecoder.SetCodeLengths(&newLevels[kMainTableSize])); -- RIF(m_AlignDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize])); -- RIF(m_LenDecoder.SetCodeLengths(&newLevels[kMainTableSize + kDistTableSize + kAlignTableSize])); -- -- memcpy(m_LastLevels, newLevels, kTablesSizesSum); -- return S_OK; --} -- --class CCoderReleaser --{ -- CDecoder *m_Coder; --public: -- CCoderReleaser(CDecoder *coder): m_Coder(coder) {} -- ~CCoderReleaser() -- { -- m_Coder->ReleaseStreams(); -- } --}; -- --HRESULT CDecoder::ReadEndOfBlock(bool &keepDecompressing) --{ -- if (ReadBits(1) != 0) -- { -- // old file -- TablesRead = false; -- return ReadTables(keepDecompressing); -- } -- // new file -- keepDecompressing = false; -- TablesRead = (ReadBits(1) == 0); -- return S_OK; --} -- --UInt32 kDistStart[kDistTableSize]; -- --class CDistInit --{ --public: -- CDistInit() { Init(); } -- void Init() -- { -- UInt32 start = 0; -- for (UInt32 i = 0; i < kDistTableSize; i++) -- { -- kDistStart[i] = start; -- start += (1 << kDistDirectBits[i]); -- } -- } --} g_DistInit; -- --HRESULT CDecoder::DecodeLZ(bool &keepDecompressing) --{ -- UInt32 rep0 = _reps[0]; -- UInt32 rep1 = _reps[1]; -- UInt32 rep2 = _reps[2]; -- UInt32 rep3 = _reps[3]; -- UInt32 length = _lastLength; -- for (;;) -- { -- if (((_wrPtr - _winPos) & kWindowMask) < 260 && _wrPtr != _winPos) -- { -- RINOK(WriteBuf()); -- if (_writtenFileSize > _unpackSize) -- { -- keepDecompressing = false; -- return S_OK; -- } -- } -- UInt32 number = m_MainDecoder.DecodeSymbol(&m_InBitStream.bitDecoder); -- if (number < 256) -- { -- PutByte((Byte)number); -- continue; -- } -- else if (number == kSymbolReadTable) -- { -- RINOK(ReadEndOfBlock(keepDecompressing)); -- break; -- } -- else if (number == 257) -- { -- if (!ReadVmCodeLZ()) -- return S_FALSE; -- continue; -- } -- else if (number == 258) -- { -- if (length == 0) -- return S_FALSE; -- } -- else if (number < kSymbolRep + 4) -- { -- if (number != kSymbolRep) -- { -- UInt32 distance; -- if (number == kSymbolRep + 1) -- distance = rep1; -- else -- { -- if (number == kSymbolRep + 2) -- distance = rep2; -- else -- { -- distance = rep3; -- rep3 = rep2; -- } -- rep2 = rep1; -- } -- rep1 = rep0; -- rep0 = distance; -- } -- -- UInt32 number = m_LenDecoder.DecodeSymbol(&m_InBitStream.bitDecoder); -- if (number >= kLenTableSize) -- return S_FALSE; -- length = 2 + kLenStart[number] + m_InBitStream.bitDecoder.ReadBits(kLenDirectBits[number]); -- } -- else -- { -- rep3 = rep2; -- rep2 = rep1; -- rep1 = rep0; -- if (number < 271) -- { -- number -= 263; -- rep0 = kLen2DistStarts[number] + m_InBitStream.bitDecoder.ReadBits(kLen2DistDirectBits[number]); -- length = 2; -- } -- else if (number < 299) -- { -- number -= 271; -- length = kNormalMatchMinLen + (UInt32)kLenStart[number] + m_InBitStream.bitDecoder.ReadBits(kLenDirectBits[number]); -- UInt32 number = m_DistDecoder.DecodeSymbol(&m_InBitStream.bitDecoder); -- if (number >= kDistTableSize) -- return S_FALSE; -- rep0 = kDistStart[number]; -- int numBits = kDistDirectBits[number]; -- if (number >= (kNumAlignBits * 2) + 2) -- { -- if (numBits > kNumAlignBits) -- rep0 += (m_InBitStream.bitDecoder.ReadBits(numBits - kNumAlignBits) << kNumAlignBits); -- if (PrevAlignCount > 0) -- { -- PrevAlignCount--; -- rep0 += PrevAlignBits; -- } -- else -- { -- UInt32 number = m_AlignDecoder.DecodeSymbol(&m_InBitStream.bitDecoder); -- if (number < (1 << kNumAlignBits)) -- { -- rep0 += number; -- PrevAlignBits = number; -- } -- else if (number == (1 << kNumAlignBits)) -- { -- PrevAlignCount = kNumAlignReps; -- rep0 += PrevAlignBits; -- } -- else -- return S_FALSE; -- } -- } -- else -- rep0 += m_InBitStream.bitDecoder.ReadBits(numBits); -- length += ((kDistLimit4 - rep0) >> 31) + ((kDistLimit3 - rep0) >> 31); -- } -- else -- return S_FALSE; -- } -- if (rep0 >= _lzSize) -- return S_FALSE; -- CopyBlock(rep0, length); -- } -- _reps[0] = rep0; -- _reps[1] = rep1; -- _reps[2] = rep2; -- _reps[3] = rep3; -- _lastLength = length; -- -- return S_OK; --} -- --HRESULT CDecoder::CodeReal(ICompressProgressInfo *progress) --{ -- _writtenFileSize = 0; -- if (!m_IsSolid) -- { -- _lzSize = 0; -- _winPos = 0; -- _wrPtr = 0; -- for (int i = 0; i < kNumReps; i++) -- _reps[i] = 0; -- _lastLength = 0; -- memset(m_LastLevels, 0, kTablesSizesSum); -- TablesRead = false; -- PpmEscChar = 2; -- PpmError = true; -- InitFilters(); -- } -- if (!m_IsSolid || !TablesRead) -- { -- bool keepDecompressing; -- RINOK(ReadTables(keepDecompressing)); -- if (!keepDecompressing) -- return S_OK; -- } -- -- for (;;) -- { -- bool keepDecompressing; -- if (_lzMode) -- { -- RINOK(DecodeLZ(keepDecompressing)) -- } -- else -- { -- RINOK(DecodePPM(1 << 18, keepDecompressing)) -- } -- UInt64 packSize = m_InBitStream.bitDecoder.GetProcessedSize(); -- RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize)); -- if (!keepDecompressing) -- break; -- } -- RINOK(WriteBuf()); -- UInt64 packSize = m_InBitStream.bitDecoder.GetProcessedSize(); -- RINOK(progress->SetRatioInfo(&packSize, &_writtenFileSize)); -- if (_writtenFileSize < _unpackSize) -- return S_FALSE; -- return S_OK; --} -- --STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress) --{ -- try -- { -- if (inSize == NULL || outSize == NULL) -- return E_INVALIDARG; -- -- if (_vmData == 0) -- { -- _vmData = (Byte *)::MidAlloc(kVmDataSizeMax + kVmCodeSizeMax); -- if (_vmData == 0) -- return E_OUTOFMEMORY; -- _vmCode = _vmData + kVmDataSizeMax; -- } -- -- if (_window == 0) -- { -- _window = (Byte *)::MidAlloc(kWindowSize); -- if (_window == 0) -- return E_OUTOFMEMORY; -- } -- if (!m_InBitStream.bitDecoder.Create(1 << 20)) -- return E_OUTOFMEMORY; -- if (!_vm.Create()) -- return E_OUTOFMEMORY; -- -- -- m_InBitStream.bitDecoder.SetStream(inStream); -- m_InBitStream.bitDecoder.Init(); -- _outStream = outStream; -- -- CCoderReleaser coderReleaser(this); -- _unpackSize = *outSize; -- return CodeReal(progress); -- } -- catch(const CInBufferException &e) { return e.ErrorCode; } -- catch(...) { return S_FALSE; } -- // CNewException is possible here. But probably CNewException is caused -- // by error in data stream. --} -- --STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) --{ -- if (size < 1) -- return E_INVALIDARG; -- m_IsSolid = (data[0] != 0); -- return S_OK; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.h ---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Decoder.h 2010-03-16 16:08:18.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Decoder.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,267 +0,0 @@ --// Rar3Decoder.h --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --/* This code uses Carryless rangecoder (1999): Dmitry Subbotin : Public domain */ -- --#ifndef __COMPRESS_RAR3_DECODER_H --#define __COMPRESS_RAR3_DECODER_H -- --#include "../../../C/Ppmd7.h" -- --#include "../../Common/MyCom.h" -- --#include "../ICoder.h" -- --#include "../Common/InBuffer.h" -- --#include "BitmDecoder.h" --#include "HuffmanDecoder.h" --#include "Rar3Vm.h" -- --namespace NCompress { --namespace NRar3 { -- --const UInt32 kWindowSize = 1 << 22; --const UInt32 kWindowMask = (kWindowSize - 1); -- --const UInt32 kNumReps = 4; --const UInt32 kNumLen2Symbols = 8; --const UInt32 kLenTableSize = 28; --const UInt32 kMainTableSize = 256 + 1 + 1 + 1 + kNumReps + kNumLen2Symbols + kLenTableSize; --const UInt32 kDistTableSize = 60; -- --const int kNumAlignBits = 4; --const UInt32 kAlignTableSize = (1 << kNumAlignBits) + 1; -- --const UInt32 kLevelTableSize = 20; -- --const UInt32 kTablesSizesSum = kMainTableSize + kDistTableSize + kAlignTableSize + kLenTableSize; -- --class CBitDecoder --{ -- UInt32 m_Value; -- unsigned m_BitPos; --public: -- CInBuffer m_Stream; -- bool Create(UInt32 bufferSize) { return m_Stream.Create(bufferSize); } -- void SetStream(ISequentialInStream *inStream) { m_Stream.SetStream(inStream);} -- void ReleaseStream() { m_Stream.ReleaseStream();} -- -- void Init() -- { -- m_Stream.Init(); -- m_BitPos = 0; -- m_Value = 0; -- } -- -- UInt64 GetProcessedSize() const { return m_Stream.GetProcessedSize() - (m_BitPos) / 8; } -- UInt32 GetBitPosition() const { return ((8 - m_BitPos) & 7); } -- -- UInt32 GetValue(unsigned numBits) -- { -- if (m_BitPos < numBits) -- { -- m_BitPos += 8; -- m_Value = (m_Value << 8) | m_Stream.ReadByte(); -- if (m_BitPos < numBits) -- { -- m_BitPos += 8; -- m_Value = (m_Value << 8) | m_Stream.ReadByte(); -- } -- } -- return m_Value >> (m_BitPos - numBits); -- } -- -- void MovePos(unsigned numBits) -- { -- m_BitPos -= numBits; -- m_Value = m_Value & ((1 << m_BitPos) - 1); -- } -- -- UInt32 ReadBits(unsigned numBits) -- { -- UInt32 res = GetValue(numBits); -- MovePos(numBits); -- return res; -- } --}; -- --const UInt32 kTopValue = (1 << 24); --const UInt32 kBot = (1 << 15); -- --struct CRangeDecoder --{ -- IPpmd7_RangeDec s; -- UInt32 Range; -- UInt32 Code; -- UInt32 Low; -- CBitDecoder bitDecoder; -- SRes Res; -- --public: -- void InitRangeCoder() -- { -- Code = 0; -- Low = 0; -- Range = 0xFFFFFFFF; -- for (int i = 0; i < 4; i++) -- Code = (Code << 8) | bitDecoder.ReadBits(8); -- } -- -- void Normalize() -- { -- while ((Low ^ (Low + Range)) < kTopValue || -- Range < kBot && ((Range = (0 - Low) & (kBot - 1)), 1)) -- { -- Code = (Code << 8) | bitDecoder.m_Stream.ReadByte(); -- Range <<= 8; -- Low <<= 8; -- } -- } -- -- CRangeDecoder(); --}; -- --struct CFilter: public NVm::CProgram --{ -- CRecordVector GlobalData; -- UInt32 BlockStart; -- UInt32 BlockSize; -- UInt32 ExecCount; -- CFilter(): BlockStart(0), BlockSize(0), ExecCount(0) {} --}; -- --struct CTempFilter: public NVm::CProgramInitState --{ -- UInt32 BlockStart; -- UInt32 BlockSize; -- UInt32 ExecCount; -- bool NextWindow; -- -- UInt32 FilterIndex; --}; -- --const int kNumHuffmanBits = 15; -- --class CDecoder: -- public ICompressCoder, -- public ICompressSetDecoderProperties2, -- public CMyUnknownImp --{ -- CRangeDecoder m_InBitStream; -- Byte *_window; -- UInt32 _winPos; -- UInt32 _wrPtr; -- UInt64 _lzSize; -- UInt64 _unpackSize; -- UInt64 _writtenFileSize; // if it's > _unpackSize, then _unpackSize only written -- CMyComPtr _outStream; -- NHuffman::CDecoder m_MainDecoder; -- NHuffman::CDecoder m_DistDecoder; -- NHuffman::CDecoder m_AlignDecoder; -- NHuffman::CDecoder m_LenDecoder; -- NHuffman::CDecoder m_LevelDecoder; -- -- UInt32 _reps[kNumReps]; -- UInt32 _lastLength; -- -- Byte m_LastLevels[kTablesSizesSum]; -- -- Byte *_vmData; -- Byte *_vmCode; -- NVm::CVm _vm; -- CRecordVector _filters; -- CRecordVector _tempFilters; -- UInt32 _lastFilter; -- -- bool m_IsSolid; -- -- bool _lzMode; -- -- UInt32 PrevAlignBits; -- UInt32 PrevAlignCount; -- -- bool TablesRead; -- -- CPpmd7 _ppmd; -- int PpmEscChar; -- bool PpmError; -- -- HRESULT WriteDataToStream(const Byte *data, UInt32 size); -- HRESULT WriteData(const Byte *data, UInt32 size); -- HRESULT WriteArea(UInt32 startPtr, UInt32 endPtr); -- void ExecuteFilter(int tempFilterIndex, NVm::CBlockRef &outBlockRef); -- HRESULT WriteBuf(); -- -- void InitFilters(); -- bool AddVmCode(UInt32 firstByte, UInt32 codeSize); -- bool ReadVmCodeLZ(); -- bool ReadVmCodePPM(); -- -- UInt32 ReadBits(int numBits); -- -- HRESULT InitPPM(); -- int DecodePpmSymbol(); -- HRESULT DecodePPM(Int32 num, bool &keepDecompressing); -- -- HRESULT ReadTables(bool &keepDecompressing); -- HRESULT ReadEndOfBlock(bool &keepDecompressing); -- HRESULT DecodeLZ(bool &keepDecompressing); -- HRESULT CodeReal(ICompressProgressInfo *progress); --public: -- CDecoder(); -- ~CDecoder(); -- -- MY_UNKNOWN_IMP1(ICompressSetDecoderProperties2) -- -- void ReleaseStreams() -- { -- _outStream.Release(); -- m_InBitStream.bitDecoder.ReleaseStream(); -- } -- -- STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, -- const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); -- -- STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); -- -- void CopyBlock(UInt32 distance, UInt32 len) -- { -- _lzSize += len; -- UInt32 pos = (_winPos - distance - 1) & kWindowMask; -- Byte *window = _window; -- UInt32 winPos = _winPos; -- if (kWindowSize - winPos > len && kWindowSize - pos > len) -- { -- const Byte *src = window + pos; -- Byte *dest = window + winPos; -- _winPos += len; -- do -- *dest++ = *src++; -- while(--len != 0); -- return; -- } -- do -- { -- window[winPos] = window[pos]; -- winPos = (winPos + 1) & kWindowMask; -- pos = (pos + 1) & kWindowMask; -- } -- while(--len != 0); -- _winPos = winPos; -- } -- -- void PutByte(Byte b) -- { -- _window[_winPos] = b; -- _winPos = (_winPos + 1) & kWindowMask; -- _lzSize++; -- } -- -- --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp ---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp 2010-10-20 01:56:07.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,1091 +0,0 @@ --// Rar3Vm.cpp --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --/* --Note: -- Due to performance considerations Rar VM may set Flags C incorrectly -- for some operands (SHL x, 0, ... ). -- Check implementation of concrete VM command -- to see if it sets flags right. --*/ -- --#include "StdAfx.h" -- --#include "../../../C/7zCrc.h" --#include "../../../C/Alloc.h" -- --#include "Rar3Vm.h" -- --namespace NCompress { --namespace NRar3 { -- --UInt32 CMemBitDecoder::ReadBits(int numBits) --{ -- UInt32 res = 0; -- for (;;) -- { -- Byte b = _bitPos < _bitSize ? _data[_bitPos >> 3] : 0; -- int avail = (int)(8 - (_bitPos & 7)); -- if (numBits <= avail) -- { -- _bitPos += numBits; -- return res | (b >> (avail - numBits)) & ((1 << numBits) - 1); -- } -- numBits -= avail; -- res |= (UInt32)(b & ((1 << avail) - 1)) << numBits; -- _bitPos += avail; -- } --} -- --UInt32 CMemBitDecoder::ReadBit() { return ReadBits(1); } -- --namespace NVm { -- --static const UInt32 kStackRegIndex = kNumRegs - 1; -- --static const UInt32 FLAG_C = 1; --static const UInt32 FLAG_Z = 2; --static const UInt32 FLAG_S = 0x80000000; -- --static const Byte CF_OP0 = 0; --static const Byte CF_OP1 = 1; --static const Byte CF_OP2 = 2; --static const Byte CF_OPMASK = 3; --static const Byte CF_BYTEMODE = 4; --static const Byte CF_JUMP = 8; --static const Byte CF_PROC = 16; --static const Byte CF_USEFLAGS = 32; --static const Byte CF_CHFLAGS = 64; -- --static Byte kCmdFlags[]= --{ -- /* CMD_MOV */ CF_OP2 | CF_BYTEMODE, -- /* CMD_CMP */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_ADD */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_SUB */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_JZ */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JNZ */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_INC */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_DEC */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_JMP */ CF_OP1 | CF_JUMP, -- /* CMD_XOR */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_AND */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_OR */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_TEST */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_JS */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JNS */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JB */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JBE */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JA */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_JAE */ CF_OP1 | CF_JUMP | CF_USEFLAGS, -- /* CMD_PUSH */ CF_OP1, -- /* CMD_POP */ CF_OP1, -- /* CMD_CALL */ CF_OP1 | CF_PROC, -- /* CMD_RET */ CF_OP0 | CF_PROC, -- /* CMD_NOT */ CF_OP1 | CF_BYTEMODE, -- /* CMD_SHL */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_SHR */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_SAR */ CF_OP2 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_NEG */ CF_OP1 | CF_BYTEMODE | CF_CHFLAGS, -- /* CMD_PUSHA */ CF_OP0, -- /* CMD_POPA */ CF_OP0, -- /* CMD_PUSHF */ CF_OP0 | CF_USEFLAGS, -- /* CMD_POPF */ CF_OP0 | CF_CHFLAGS, -- /* CMD_MOVZX */ CF_OP2, -- /* CMD_MOVSX */ CF_OP2, -- /* CMD_XCHG */ CF_OP2 | CF_BYTEMODE, -- /* CMD_MUL */ CF_OP2 | CF_BYTEMODE, -- /* CMD_DIV */ CF_OP2 | CF_BYTEMODE, -- /* CMD_ADC */ CF_OP2 | CF_BYTEMODE | CF_USEFLAGS | CF_CHFLAGS , -- /* CMD_SBB */ CF_OP2 | CF_BYTEMODE | CF_USEFLAGS | CF_CHFLAGS , -- /* CMD_PRINT */ CF_OP0 --}; -- --CVm::CVm(): Mem(NULL) {} -- --bool CVm::Create() --{ -- if (Mem == NULL) -- Mem = (Byte *)::MyAlloc(kSpaceSize + 4); -- return (Mem != NULL); --} -- --CVm::~CVm() --{ -- ::MyFree(Mem); --} -- --// CVm::Execute can change CProgram object: it clears progarm if VM returns error. -- --bool CVm::Execute(CProgram *prg, const CProgramInitState *initState, -- CBlockRef &outBlockRef, CRecordVector &outGlobalData) --{ -- memcpy(R, initState->InitR, sizeof(initState->InitR)); -- R[kStackRegIndex] = kSpaceSize; -- R[kNumRegs] = 0; -- Flags = 0; -- -- UInt32 globalSize = MyMin((UInt32)initState->GlobalData.Size(), kGlobalSize); -- if (globalSize != 0) -- memcpy(Mem + kGlobalOffset, &initState->GlobalData[0], globalSize); -- UInt32 staticSize = MyMin((UInt32)prg->StaticData.Size(), kGlobalSize - globalSize); -- if (staticSize != 0) -- memcpy(Mem + kGlobalOffset + globalSize, &prg->StaticData[0], staticSize); -- -- bool res = true; -- #ifdef RARVM_STANDARD_FILTERS -- if (prg->StandardFilterIndex >= 0) -- ExecuteStandardFilter(prg->StandardFilterIndex); -- else -- #endif -- { -- res = ExecuteCode(prg); -- if (!res) -- prg->Commands[0].OpCode = CMD_RET; -- } -- UInt32 newBlockPos = GetFixedGlobalValue32(NGlobalOffset::kBlockPos) & kSpaceMask; -- UInt32 newBlockSize = GetFixedGlobalValue32(NGlobalOffset::kBlockSize) & kSpaceMask; -- if (newBlockPos + newBlockSize >= kSpaceSize) -- newBlockPos = newBlockSize = 0; -- outBlockRef.Offset = newBlockPos; -- outBlockRef.Size = newBlockSize; -- -- outGlobalData.Clear(); -- UInt32 dataSize = GetFixedGlobalValue32(NGlobalOffset::kGlobalMemOutSize); -- dataSize = MyMin(dataSize, kGlobalSize - kFixedGlobalSize); -- if (dataSize != 0) -- { -- dataSize += kFixedGlobalSize; -- outGlobalData.Reserve(dataSize); -- for (UInt32 i = 0; i < dataSize; i++) -- outGlobalData.Add(Mem[kGlobalOffset + i]); -- } -- return res; --} -- -- --#define SET_IP(IP) \ -- if ((IP) >= numCommands) return true; \ -- if (--maxOpCount <= 0) return false; \ -- cmd = commands + (IP); -- --#define GET_FLAG_S_B(res) (((res) & 0x80) ? FLAG_S : 0) --#define SET_IP_OP1 { UInt32 val = GetOperand32(&cmd->Op1); SET_IP(val); } --#define FLAGS_UPDATE_SZ Flags = res == 0 ? FLAG_Z : res & FLAG_S --#define FLAGS_UPDATE_SZ_B Flags = (res & 0xFF) == 0 ? FLAG_Z : GET_FLAG_S_B(res) -- --UInt32 CVm::GetOperand32(const COperand *op) const --{ -- switch(op->Type) -- { -- case OP_TYPE_REG: return R[op->Data]; -- case OP_TYPE_REGMEM: return GetValue32(&Mem[(op->Base + R[op->Data]) & kSpaceMask]); -- default: return op->Data; -- } --} -- --void CVm::SetOperand32(const COperand *op, UInt32 val) --{ -- switch(op->Type) -- { -- case OP_TYPE_REG: R[op->Data] = val; return; -- case OP_TYPE_REGMEM: SetValue32(&Mem[(op->Base + R[op->Data]) & kSpaceMask], val); return; -- } --} -- --Byte CVm::GetOperand8(const COperand *op) const --{ -- switch(op->Type) -- { -- case OP_TYPE_REG: return (Byte)R[op->Data]; -- case OP_TYPE_REGMEM: return Mem[(op->Base + R[op->Data]) & kSpaceMask];; -- default: return (Byte)op->Data; -- } --} -- --void CVm::SetOperand8(const COperand *op, Byte val) --{ -- switch(op->Type) -- { -- case OP_TYPE_REG: R[op->Data] = (R[op->Data] & 0xFFFFFF00) | val; return; -- case OP_TYPE_REGMEM: Mem[(op->Base + R[op->Data]) & kSpaceMask] = val; return; -- } --} -- --UInt32 CVm::GetOperand(bool byteMode, const COperand *op) const --{ -- if (byteMode) -- return GetOperand8(op); -- return GetOperand32(op); --} -- --void CVm::SetOperand(bool byteMode, const COperand *op, UInt32 val) --{ -- if (byteMode) -- SetOperand8(op, (Byte)(val & 0xFF)); -- else -- SetOperand32(op, val); --} -- --bool CVm::ExecuteCode(const CProgram *prg) --{ -- Int32 maxOpCount = 25000000; -- const CCommand *commands = &prg->Commands[0]; -- const CCommand *cmd = commands; -- UInt32 numCommands = prg->Commands.Size(); -- for (;;) -- { -- switch(cmd->OpCode) -- { -- #ifndef RARVM_NO_VM -- -- case CMD_MOV: -- SetOperand32(&cmd->Op1, GetOperand32(&cmd->Op2)); -- break; -- case CMD_MOVB: -- SetOperand8(&cmd->Op1, GetOperand8(&cmd->Op2)); -- break; -- case CMD_CMP: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- UInt32 res = v1 - GetOperand32(&cmd->Op2); -- Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S); -- } -- break; -- case CMD_CMPB: -- { -- Byte v1 = GetOperand8(&cmd->Op1); -- Byte res = v1 - GetOperand8(&cmd->Op2); -- res &= 0xFF; -- Flags = res == 0 ? FLAG_Z : (res > v1) | GET_FLAG_S_B(res); -- } -- break; -- case CMD_ADD: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- UInt32 res = v1 + GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- Flags = (res < v1) | (res == 0 ? FLAG_Z : (res & FLAG_S)); -- } -- break; -- case CMD_ADDB: -- { -- Byte v1 = GetOperand8(&cmd->Op1); -- Byte res = v1 + GetOperand8(&cmd->Op2); -- res &= 0xFF; -- SetOperand8(&cmd->Op1, (Byte)res); -- Flags = (res < v1) | (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)); -- } -- break; -- case CMD_ADC: -- { -- UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1); -- UInt32 FC = (Flags & FLAG_C); -- UInt32 res = v1 + GetOperand(cmd->ByteMode, &cmd->Op2) + FC; -- if (cmd->ByteMode) -- res &= 0xFF; -- SetOperand(cmd->ByteMode, &cmd->Op1, res); -- Flags = (res < v1 || res == v1 && FC) | (res == 0 ? FLAG_Z : (res & FLAG_S)); -- } -- break; -- case CMD_SUB: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- UInt32 res = v1 - GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S); -- } -- break; -- case CMD_SUBB: -- { -- UInt32 v1 = GetOperand8(&cmd->Op1); -- UInt32 res = v1 - GetOperand8(&cmd->Op2); -- SetOperand8(&cmd->Op1, (Byte)res); -- Flags = res == 0 ? FLAG_Z : (res > v1) | (res & FLAG_S); -- } -- break; -- case CMD_SBB: -- { -- UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1); -- UInt32 FC = (Flags & FLAG_C); -- UInt32 res = v1 - GetOperand(cmd->ByteMode, &cmd->Op2) - FC; -- // Flags = res == 0 ? FLAG_Z : (res > v1 || res == v1 && FC) | (res & FLAG_S); -- if (cmd->ByteMode) -- res &= 0xFF; -- SetOperand(cmd->ByteMode, &cmd->Op1, res); -- Flags = (res > v1 || res == v1 && FC) | (res == 0 ? FLAG_Z : (res & FLAG_S)); -- } -- break; -- case CMD_INC: -- { -- UInt32 res = GetOperand32(&cmd->Op1) + 1; -- SetOperand32(&cmd->Op1, res); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_INCB: -- { -- Byte res = GetOperand8(&cmd->Op1) + 1; -- SetOperand8(&cmd->Op1, res);; -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_DEC: -- { -- UInt32 res = GetOperand32(&cmd->Op1) - 1; -- SetOperand32(&cmd->Op1, res); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_DECB: -- { -- Byte res = GetOperand8(&cmd->Op1) - 1; -- SetOperand8(&cmd->Op1, res);; -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_XOR: -- { -- UInt32 res = GetOperand32(&cmd->Op1) ^ GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_XORB: -- { -- Byte res = GetOperand8(&cmd->Op1) ^ GetOperand8(&cmd->Op2); -- SetOperand8(&cmd->Op1, res); -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_AND: -- { -- UInt32 res = GetOperand32(&cmd->Op1) & GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_ANDB: -- { -- Byte res = GetOperand8(&cmd->Op1) & GetOperand8(&cmd->Op2); -- SetOperand8(&cmd->Op1, res); -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_OR: -- { -- UInt32 res = GetOperand32(&cmd->Op1) | GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_ORB: -- { -- Byte res = GetOperand8(&cmd->Op1) | GetOperand8(&cmd->Op2); -- SetOperand8(&cmd->Op1, res); -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_TEST: -- { -- UInt32 res = GetOperand32(&cmd->Op1) & GetOperand32(&cmd->Op2); -- FLAGS_UPDATE_SZ; -- } -- break; -- case CMD_TESTB: -- { -- Byte res = GetOperand8(&cmd->Op1) & GetOperand8(&cmd->Op2); -- FLAGS_UPDATE_SZ_B; -- } -- break; -- case CMD_NOT: -- SetOperand(cmd->ByteMode, &cmd->Op1, ~GetOperand(cmd->ByteMode, &cmd->Op1)); -- break; -- case CMD_NEG: -- { -- UInt32 res = 0 - GetOperand32(&cmd->Op1); -- SetOperand32(&cmd->Op1, res); -- Flags = res == 0 ? FLAG_Z : FLAG_C | (res & FLAG_S); -- } -- break; -- case CMD_NEGB: -- { -- Byte res = (Byte)(0 - GetOperand8(&cmd->Op1)); -- SetOperand8(&cmd->Op1, res); -- Flags = res == 0 ? FLAG_Z : FLAG_C | GET_FLAG_S_B(res); -- } -- break; -- -- case CMD_SHL: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- int v2 = (int)GetOperand32(&cmd->Op2); -- UInt32 res = v1 << v2; -- SetOperand32(&cmd->Op1, res); -- Flags = (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 << (v2 - 1)) & 0x80000000 ? FLAG_C : 0); -- } -- break; -- case CMD_SHLB: -- { -- Byte v1 = GetOperand8(&cmd->Op1); -- int v2 = (int)GetOperand8(&cmd->Op2); -- Byte res = (Byte)(v1 << v2); -- SetOperand8(&cmd->Op1, res); -- Flags = (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 << (v2 - 1)) & 0x80 ? FLAG_C : 0); -- } -- break; -- case CMD_SHR: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- int v2 = (int)GetOperand32(&cmd->Op2); -- UInt32 res = v1 >> v2; -- SetOperand32(&cmd->Op1, res); -- Flags = (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 >> (v2 - 1)) & FLAG_C); -- } -- break; -- case CMD_SHRB: -- { -- Byte v1 = GetOperand8(&cmd->Op1); -- int v2 = (int)GetOperand8(&cmd->Op2); -- Byte res = (Byte)(v1 >> v2); -- SetOperand8(&cmd->Op1, res); -- Flags = (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 >> (v2 - 1)) & FLAG_C); -- } -- break; -- case CMD_SAR: -- { -- UInt32 v1 = GetOperand32(&cmd->Op1); -- int v2 = (int)GetOperand32(&cmd->Op2); -- UInt32 res = UInt32(((Int32)v1) >> v2); -- SetOperand32(&cmd->Op1, res); -- Flags= (res == 0 ? FLAG_Z : (res & FLAG_S)) | ((v1 >> (v2 - 1)) & FLAG_C); -- } -- break; -- case CMD_SARB: -- { -- Byte v1 = GetOperand8(&cmd->Op1); -- int v2 = (int)GetOperand8(&cmd->Op2); -- Byte res = (Byte)(((signed char)v1) >> v2); -- SetOperand8(&cmd->Op1, res); -- Flags= (res == 0 ? FLAG_Z : GET_FLAG_S_B(res)) | ((v1 >> (v2 - 1)) & FLAG_C); -- } -- break; -- -- case CMD_JMP: -- SET_IP_OP1; -- continue; -- case CMD_JZ: -- if ((Flags & FLAG_Z) != 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JNZ: -- if ((Flags & FLAG_Z) == 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JS: -- if ((Flags & FLAG_S) != 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JNS: -- if ((Flags & FLAG_S) == 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JB: -- if ((Flags & FLAG_C) != 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JBE: -- if ((Flags & (FLAG_C | FLAG_Z)) != 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JA: -- if ((Flags & (FLAG_C | FLAG_Z)) == 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- case CMD_JAE: -- if ((Flags & FLAG_C) == 0) -- { -- SET_IP_OP1; -- continue; -- } -- break; -- -- case CMD_PUSH: -- R[kStackRegIndex] -= 4; -- SetValue32(&Mem[R[kStackRegIndex] & kSpaceMask], GetOperand32(&cmd->Op1)); -- break; -- case CMD_POP: -- SetOperand32(&cmd->Op1, GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask])); -- R[kStackRegIndex] += 4; -- break; -- case CMD_CALL: -- R[kStackRegIndex] -= 4; -- SetValue32(&Mem[R[kStackRegIndex] & kSpaceMask], (UInt32)(cmd - commands + 1)); -- SET_IP_OP1; -- continue; -- -- case CMD_PUSHA: -- { -- for (UInt32 i = 0, SP = R[kStackRegIndex] - 4; i < kNumRegs; i++, SP -= 4) -- SetValue32(&Mem[SP & kSpaceMask], R[i]); -- R[kStackRegIndex] -= kNumRegs * 4; -- } -- break; -- case CMD_POPA: -- { -- for (UInt32 i = 0, SP = R[kStackRegIndex]; i < kNumRegs; i++, SP += 4) -- R[kStackRegIndex - i] = GetValue32(&Mem[SP & kSpaceMask]); -- } -- break; -- case CMD_PUSHF: -- R[kStackRegIndex] -= 4; -- SetValue32(&Mem[R[kStackRegIndex]&kSpaceMask], Flags); -- break; -- case CMD_POPF: -- Flags = GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask]); -- R[kStackRegIndex] += 4; -- break; -- -- case CMD_MOVZX: -- SetOperand32(&cmd->Op1, GetOperand8(&cmd->Op2)); -- break; -- case CMD_MOVSX: -- SetOperand32(&cmd->Op1, (UInt32)(Int32)(signed char)GetOperand8(&cmd->Op2)); -- break; -- case CMD_XCHG: -- { -- UInt32 v1 = GetOperand(cmd->ByteMode, &cmd->Op1); -- SetOperand(cmd->ByteMode, &cmd->Op1, GetOperand(cmd->ByteMode, &cmd->Op2)); -- SetOperand(cmd->ByteMode, &cmd->Op2, v1); -- } -- break; -- case CMD_MUL: -- { -- UInt32 res = GetOperand32(&cmd->Op1) * GetOperand32(&cmd->Op2); -- SetOperand32(&cmd->Op1, res); -- } -- break; -- case CMD_MULB: -- { -- Byte res = GetOperand8(&cmd->Op1) * GetOperand8(&cmd->Op2); -- SetOperand8(&cmd->Op1, res); -- } -- break; -- case CMD_DIV: -- { -- UInt32 divider = GetOperand(cmd->ByteMode, &cmd->Op2); -- if (divider != 0) -- { -- UInt32 res = GetOperand(cmd->ByteMode, &cmd->Op1) / divider; -- SetOperand(cmd->ByteMode, &cmd->Op1, res); -- } -- } -- break; -- -- #endif -- -- case CMD_RET: -- { -- if (R[kStackRegIndex] >= kSpaceSize) -- return true; -- UInt32 ip = GetValue32(&Mem[R[kStackRegIndex] & kSpaceMask]); -- SET_IP(ip); -- R[kStackRegIndex] += 4; -- continue; -- } -- case CMD_PRINT: -- break; -- } -- cmd++; -- --maxOpCount; -- } --} -- -- --////////////////////////////////////////////////////// --// Read program -- --UInt32 ReadEncodedUInt32(CMemBitDecoder &inp) --{ -- switch(inp.ReadBits(2)) -- { -- case 0: -- return inp.ReadBits(4); -- case 1: -- { -- UInt32 v = inp.ReadBits(4); -- if (v == 0) -- return 0xFFFFFF00 | inp.ReadBits(8); -- else -- return (v << 4) | inp.ReadBits(4); -- } -- case 2: -- return inp.ReadBits(16); -- default: -- return inp.ReadBits(32); -- } --} -- --void CVm::DecodeArg(CMemBitDecoder &inp, COperand &op, bool byteMode) --{ -- if (inp.ReadBit()) -- { -- op.Type = OP_TYPE_REG; -- op.Data = inp.ReadBits(kNumRegBits); -- } -- else if (inp.ReadBit() == 0) -- { -- op.Type = OP_TYPE_INT; -- if (byteMode) -- op.Data = inp.ReadBits(8); -- else -- op.Data = ReadEncodedUInt32(inp); -- } -- else -- { -- op.Type = OP_TYPE_REGMEM; -- if (inp.ReadBit() == 0) -- { -- op.Data = inp.ReadBits(kNumRegBits); -- op.Base = 0; -- } -- else -- { -- if (inp.ReadBit() == 0) -- op.Data = inp.ReadBits(kNumRegBits); -- else -- op.Data = kNumRegs; -- op.Base = ReadEncodedUInt32(inp); -- } -- } --} -- --void CVm::ReadVmProgram(const Byte *code, UInt32 codeSize, CProgram *prg) --{ -- CMemBitDecoder inp; -- inp.Init(code, codeSize); -- -- prg->StaticData.Clear(); -- if (inp.ReadBit()) -- { -- UInt32 dataSize = ReadEncodedUInt32(inp) + 1; -- for (UInt32 i = 0; inp.Avail() && i < dataSize; i++) -- prg->StaticData.Add((Byte)inp.ReadBits(8)); -- } -- while (inp.Avail()) -- { -- prg->Commands.Add(CCommand()); -- CCommand *cmd = &prg->Commands.Back(); -- if (inp.ReadBit() == 0) -- cmd->OpCode = (ECommand)inp.ReadBits(3); -- else -- cmd->OpCode = (ECommand)(8 + inp.ReadBits(5)); -- if (kCmdFlags[cmd->OpCode] & CF_BYTEMODE) -- cmd->ByteMode = (inp.ReadBit()) ? true : false; -- else -- cmd->ByteMode = 0; -- int opNum = (kCmdFlags[cmd->OpCode] & CF_OPMASK); -- if (opNum > 0) -- { -- DecodeArg(inp, cmd->Op1, cmd->ByteMode); -- if (opNum == 2) -- DecodeArg(inp, cmd->Op2, cmd->ByteMode); -- else -- { -- if (cmd->Op1.Type == OP_TYPE_INT && (kCmdFlags[cmd->OpCode] & (CF_JUMP | CF_PROC))) -- { -- int Distance = cmd->Op1.Data; -- if (Distance >= 256) -- Distance -= 256; -- else -- { -- if (Distance >= 136) -- Distance -= 264; -- else if (Distance >= 16) -- Distance -= 8; -- else if (Distance >= 8) -- Distance -= 16; -- Distance += prg->Commands.Size() - 1; -- } -- cmd->Op1.Data = Distance; -- } -- } -- } -- if (cmd->ByteMode) -- { -- switch (cmd->OpCode) -- { -- case CMD_MOV: cmd->OpCode = CMD_MOVB; break; -- case CMD_CMP: cmd->OpCode = CMD_CMPB; break; -- case CMD_ADD: cmd->OpCode = CMD_ADDB; break; -- case CMD_SUB: cmd->OpCode = CMD_SUBB; break; -- case CMD_INC: cmd->OpCode = CMD_INCB; break; -- case CMD_DEC: cmd->OpCode = CMD_DECB; break; -- case CMD_XOR: cmd->OpCode = CMD_XORB; break; -- case CMD_AND: cmd->OpCode = CMD_ANDB; break; -- case CMD_OR: cmd->OpCode = CMD_ORB; break; -- case CMD_TEST: cmd->OpCode = CMD_TESTB; break; -- case CMD_NEG: cmd->OpCode = CMD_NEGB; break; -- case CMD_SHL: cmd->OpCode = CMD_SHLB; break; -- case CMD_SHR: cmd->OpCode = CMD_SHRB; break; -- case CMD_SAR: cmd->OpCode = CMD_SARB; break; -- case CMD_MUL: cmd->OpCode = CMD_MULB; break; -- } -- } -- } --} -- --#ifdef RARVM_STANDARD_FILTERS -- --enum EStandardFilter --{ -- SF_E8, -- SF_E8E9, -- SF_ITANIUM, -- SF_RGB, -- SF_AUDIO, -- SF_DELTA, -- SF_UPCASE --}; -- --struct StandardFilterSignature --{ -- UInt32 Length; -- UInt32 CRC; -- EStandardFilter Type; --} --kStdFilters[]= --{ -- { 53, 0xad576887, SF_E8 }, -- { 57, 0x3cd7e57e, SF_E8E9 }, -- { 120, 0x3769893f, SF_ITANIUM }, -- { 29, 0x0e06077d, SF_DELTA }, -- { 149, 0x1c2c5dc8, SF_RGB }, -- { 216, 0xbc85e701, SF_AUDIO }, -- { 40, 0x46b9c560, SF_UPCASE } --}; -- --static int FindStandardFilter(const Byte *code, UInt32 codeSize) --{ -- UInt32 crc = CrcCalc(code, codeSize); -- for (int i = 0; i < sizeof(kStdFilters) / sizeof(kStdFilters[0]); i++) -- { -- StandardFilterSignature &sfs = kStdFilters[i]; -- if (sfs.CRC == crc && sfs.Length == codeSize) -- return i; -- } -- return -1; --} -- --#endif -- --void CVm::PrepareProgram(const Byte *code, UInt32 codeSize, CProgram *prg) --{ -- Byte xorSum = 0; -- for (UInt32 i = 1; i < codeSize; i++) -- xorSum ^= code[i]; -- -- prg->Commands.Clear(); -- #ifdef RARVM_STANDARD_FILTERS -- prg->StandardFilterIndex = -1; -- #endif -- -- if (xorSum == code[0] && codeSize > 0) -- { -- #ifdef RARVM_STANDARD_FILTERS -- prg->StandardFilterIndex = FindStandardFilter(code, codeSize); -- if (prg->StandardFilterIndex >= 0) -- return; -- #endif -- // 1 byte for checksum -- ReadVmProgram(code + 1, codeSize - 1, prg); -- } -- prg->Commands.Add(CCommand()); -- CCommand *cmd = &prg->Commands.Back(); -- cmd->OpCode = CMD_RET; --} -- --void CVm::SetMemory(UInt32 pos, const Byte *data, UInt32 dataSize) --{ -- if (pos < kSpaceSize && data != Mem + pos) -- memmove(Mem + pos, data, MyMin(dataSize, kSpaceSize - pos)); --} -- --#ifdef RARVM_STANDARD_FILTERS -- --static void E8E9Decode(Byte *data, UInt32 dataSize, UInt32 fileOffset, bool e9) --{ -- if (dataSize <= 4) -- return; -- dataSize -= 4; -- const UInt32 kFileSize = 0x1000000; -- Byte cmpByte2 = (e9 ? 0xE9 : 0xE8); -- for (UInt32 curPos = 0; curPos < dataSize;) -- { -- Byte curByte = *(data++); -- curPos++; -- if (curByte == 0xE8 || curByte == cmpByte2) -- { -- UInt32 offset = curPos + fileOffset; -- UInt32 addr = (Int32)GetValue32(data); -- if (addr < kFileSize) -- SetValue32(data, addr - offset); -- else if ((Int32)addr < 0 && (Int32)(addr + offset) >= 0) -- SetValue32(data, addr + kFileSize); -- data += 4; -- curPos += 4; -- } -- } --} -- --static inline UInt32 ItaniumGetOpType(const Byte *data, int bitPos) --{ -- return (data[(unsigned int)bitPos >> 3] >> (bitPos & 7)) & 0xF; --} -- -- --static void ItaniumDecode(Byte *data, UInt32 dataSize, UInt32 fileOffset) --{ -- UInt32 curPos = 0; -- fileOffset >>= 4; -- while (curPos < dataSize - 21) -- { -- int b = (data[0] & 0x1F) - 0x10; -- if (b >= 0) -- { -- static Byte kCmdMasks[16] = {4,4,6,6,0,0,7,7,4,4,0,0,4,4,0,0}; -- Byte cmdMask = kCmdMasks[b]; -- if (cmdMask != 0) -- for (int i = 0; i < 3; i++) -- if (cmdMask & (1 << i)) -- { -- int startPos = i * 41 + 18; -- if (ItaniumGetOpType(data, startPos + 24) == 5) -- { -- const UInt32 kMask = 0xFFFFF; -- Byte *p = data + ((unsigned int)startPos >> 3); -- UInt32 bitField = ((UInt32)p[0]) | ((UInt32)p[1] << 8) | ((UInt32)p[2] << 16); -- int inBit = (startPos & 7); -- UInt32 offset = (bitField >> inBit) & kMask; -- UInt32 andMask = ~(kMask << inBit); -- bitField = ((offset - fileOffset) & kMask) << inBit; -- for (int j = 0; j < 3; j++) -- { -- p[j] &= andMask; -- p[j] |= bitField; -- andMask >>= 8; -- bitField >>= 8; -- } -- } -- } -- } -- data += 16; -- curPos += 16; -- fileOffset++; -- } --} -- --static void DeltaDecode(Byte *data, UInt32 dataSize, UInt32 numChannels) --{ -- UInt32 srcPos = 0; -- UInt32 border = dataSize * 2; -- for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++) -- { -- Byte prevByte = 0; -- for (UInt32 destPos = dataSize + curChannel; destPos < border; destPos += numChannels) -- data[destPos] = (prevByte = prevByte - data[srcPos++]); -- } --} -- --static void RgbDecode(Byte *srcData, UInt32 dataSize, UInt32 width, UInt32 posR) --{ -- Byte *destData = srcData + dataSize; -- const UInt32 numChannels = 3; -- for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++) -- { -- Byte prevByte = 0; -- -- for (UInt32 i = curChannel; i < dataSize; i+= numChannels) -- { -- unsigned int predicted; -- if (i < width) -- predicted = prevByte; -- else -- { -- unsigned int upperLeftByte = destData[i - width]; -- unsigned int upperByte = destData[i - width + 3]; -- predicted = prevByte + upperByte - upperLeftByte; -- int pa = abs((int)(predicted - prevByte)); -- int pb = abs((int)(predicted - upperByte)); -- int pc = abs((int)(predicted - upperLeftByte)); -- if (pa <= pb && pa <= pc) -- predicted = prevByte; -- else -- if (pb <= pc) -- predicted = upperByte; -- else -- predicted = upperLeftByte; -- } -- destData[i] = prevByte = (Byte)(predicted - *(srcData++)); -- } -- } -- if (dataSize < 3) -- return; -- for (UInt32 i = posR, border = dataSize - 2; i < border; i += 3) -- { -- Byte g = destData[i + 1]; -- destData[i] = destData[i] + g; -- destData[i + 2] = destData[i + 2] + g; -- } --} -- --static void AudioDecode(Byte *srcData, UInt32 dataSize, UInt32 numChannels) --{ -- Byte *destData = srcData + dataSize; -- for (UInt32 curChannel = 0; curChannel < numChannels; curChannel++) -- { -- UInt32 prevByte = 0, prevDelta = 0, dif[7]; -- Int32 D1 = 0, D2 = 0, D3; -- Int32 K1 = 0, K2 = 0, K3 = 0; -- memset(dif, 0, sizeof(dif)); -- -- for (UInt32 i = curChannel, byteCount = 0; i < dataSize; i += numChannels, byteCount++) -- { -- D3 = D2; -- D2 = prevDelta - D1; -- D1 = prevDelta; -- -- UInt32 predicted = 8 * prevByte + K1 * D1 + K2 * D2 + K3 * D3; -- predicted = (predicted >> 3) & 0xFF; -- -- UInt32 curByte = *(srcData++); -- -- predicted -= curByte; -- destData[i] = (Byte)predicted; -- prevDelta = (UInt32)(Int32)(signed char)(predicted - prevByte); -- prevByte = predicted; -- -- Int32 D = ((Int32)(signed char)curByte) << 3; -- -- dif[0] += abs(D); -- dif[1] += abs(D - D1); -- dif[2] += abs(D + D1); -- dif[3] += abs(D - D2); -- dif[4] += abs(D + D2); -- dif[5] += abs(D - D3); -- dif[6] += abs(D + D3); -- -- if ((byteCount & 0x1F) == 0) -- { -- UInt32 minDif = dif[0], numMinDif = 0; -- dif[0] = 0; -- for (int j = 1; j < sizeof(dif) / sizeof(dif[0]); j++) -- { -- if (dif[j] < minDif) -- { -- minDif = dif[j]; -- numMinDif = j; -- } -- dif[j] = 0; -- } -- switch (numMinDif) -- { -- case 1: if (K1 >= -16) K1--; break; -- case 2: if (K1 < 16) K1++; break; -- case 3: if (K2 >= -16) K2--; break; -- case 4: if (K2 < 16) K2++; break; -- case 5: if (K3 >= -16) K3--; break; -- case 6: if (K3 < 16) K3++; break; -- } -- } -- } -- } --} -- --static UInt32 UpCaseDecode(Byte *data, UInt32 dataSize) --{ -- UInt32 srcPos = 0, destPos = dataSize; -- while (srcPos < dataSize) -- { -- Byte curByte = data[srcPos++]; -- if (curByte == 2 && (curByte = data[srcPos++]) != 2) -- curByte -= 32; -- data[destPos++] = curByte; -- } -- return destPos - dataSize; --} -- --void CVm::ExecuteStandardFilter(int filterIndex) --{ -- UInt32 dataSize = R[4]; -- if (dataSize >= kGlobalOffset) -- return; -- EStandardFilter filterType = kStdFilters[filterIndex].Type; -- -- switch (filterType) -- { -- case SF_E8: -- case SF_E8E9: -- E8E9Decode(Mem, dataSize, R[6], (filterType == SF_E8E9)); -- break; -- case SF_ITANIUM: -- ItaniumDecode(Mem, dataSize, R[6]); -- break; -- case SF_DELTA: -- if (dataSize >= kGlobalOffset / 2) -- break; -- SetBlockPos(dataSize); -- DeltaDecode(Mem, dataSize, R[0]); -- break; -- case SF_RGB: -- if (dataSize >= kGlobalOffset / 2) -- break; -- { -- UInt32 width = R[0]; -- if (width <= 3) -- break; -- SetBlockPos(dataSize); -- RgbDecode(Mem, dataSize, width, R[1]); -- } -- break; -- case SF_AUDIO: -- if (dataSize >= kGlobalOffset / 2) -- break; -- SetBlockPos(dataSize); -- AudioDecode(Mem, dataSize, R[0]); -- break; -- case SF_UPCASE: -- if (dataSize >= kGlobalOffset / 2) -- break; -- UInt32 destSize = UpCaseDecode(Mem, dataSize); -- SetBlockSize(destSize); -- SetBlockPos(dataSize); -- break; -- } --} -- --#endif -- --}}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.h p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.h ---- p7zip_9.20.1/CPP/7zip/Compress/Rar3Vm.h 2009-02-07 15:06:28.000000000 -0200 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/Rar3Vm.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,179 +0,0 @@ --// Rar3Vm.h --// According to unRAR license, this code may not be used to develop --// a program that creates RAR archives -- --#ifndef __COMPRESS_RAR3_VM_H --#define __COMPRESS_RAR3_VM_H -- --#include "../../../C/CpuArch.h" -- --#include "Common/MyVector.h" --#include "Common/Types.h" -- --#define RARVM_STANDARD_FILTERS -- --namespace NCompress { --namespace NRar3 { -- --class CMemBitDecoder --{ -- const Byte *_data; -- UInt32 _bitSize; -- UInt32 _bitPos; --public: -- void Init(const Byte *data, UInt32 byteSize) -- { -- _data = data; -- _bitSize = (byteSize << 3); -- _bitPos = 0; -- } -- UInt32 ReadBits(int numBits); -- UInt32 ReadBit(); -- bool Avail() const { return (_bitPos < _bitSize); } --}; -- --namespace NVm { -- --inline UInt32 GetValue32(const void *addr) { return GetUi32(addr); } --inline void SetValue32(void *addr, UInt32 value) { SetUi32(addr, value); } -- --UInt32 ReadEncodedUInt32(CMemBitDecoder &inp); -- --const int kNumRegBits = 3; --const UInt32 kNumRegs = 1 << kNumRegBits; --const UInt32 kNumGpRegs = kNumRegs - 1; -- --const UInt32 kSpaceSize = 0x40000; --const UInt32 kSpaceMask = kSpaceSize -1; --const UInt32 kGlobalOffset = 0x3C000; --const UInt32 kGlobalSize = 0x2000; --const UInt32 kFixedGlobalSize = 64; -- --namespace NGlobalOffset --{ -- const UInt32 kBlockSize = 0x1C; -- const UInt32 kBlockPos = 0x20; -- const UInt32 kExecCount = 0x2C; -- const UInt32 kGlobalMemOutSize = 0x30; --} -- --enum ECommand --{ -- CMD_MOV, CMD_CMP, CMD_ADD, CMD_SUB, CMD_JZ, CMD_JNZ, CMD_INC, CMD_DEC, -- CMD_JMP, CMD_XOR, CMD_AND, CMD_OR, CMD_TEST, CMD_JS, CMD_JNS, CMD_JB, -- CMD_JBE, CMD_JA, CMD_JAE, CMD_PUSH, CMD_POP, CMD_CALL, CMD_RET, CMD_NOT, -- CMD_SHL, CMD_SHR, CMD_SAR, CMD_NEG, CMD_PUSHA,CMD_POPA, CMD_PUSHF,CMD_POPF, -- CMD_MOVZX,CMD_MOVSX,CMD_XCHG, CMD_MUL, CMD_DIV, CMD_ADC, CMD_SBB, CMD_PRINT, -- -- CMD_MOVB, CMD_CMPB, CMD_ADDB, CMD_SUBB, CMD_INCB, CMD_DECB, -- CMD_XORB, CMD_ANDB, CMD_ORB, CMD_TESTB,CMD_NEGB, -- CMD_SHLB, CMD_SHRB, CMD_SARB, CMD_MULB --}; -- --enum EOpType {OP_TYPE_REG, OP_TYPE_INT, OP_TYPE_REGMEM, OP_TYPE_NONE}; -- --// Addr in COperand object can link (point) to CVm object!!! -- --struct COperand --{ -- EOpType Type; -- UInt32 Data; -- UInt32 Base; -- COperand(): Type(OP_TYPE_NONE), Data(0), Base(0) {} --}; -- --struct CCommand --{ -- ECommand OpCode; -- bool ByteMode; -- COperand Op1, Op2; --}; -- --struct CBlockRef --{ -- UInt32 Offset; -- UInt32 Size; --}; -- --struct CProgram --{ -- CRecordVector Commands; -- #ifdef RARVM_STANDARD_FILTERS -- int StandardFilterIndex; -- #endif -- CRecordVector StaticData; --}; -- --struct CProgramInitState --{ -- UInt32 InitR[kNumGpRegs]; -- CRecordVector GlobalData; -- -- void AllocateEmptyFixedGlobal() -- { -- GlobalData.Clear(); -- GlobalData.Reserve(NVm::kFixedGlobalSize); -- for (UInt32 i = 0; i < NVm::kFixedGlobalSize; i++) -- GlobalData.Add(0); -- } --}; -- --class CVm --{ -- static UInt32 GetValue(bool byteMode, const void *addr) -- { -- if (byteMode) -- return(*(const Byte *)addr); -- else -- return GetUi32(addr); -- } -- -- static void SetValue(bool byteMode, void *addr, UInt32 value) -- { -- if (byteMode) -- *(Byte *)addr = (Byte)value; -- else -- SetUi32(addr, value); -- } -- -- UInt32 GetFixedGlobalValue32(UInt32 globalOffset) { return GetValue(false, &Mem[kGlobalOffset + globalOffset]); } -- -- void SetBlockSize(UInt32 v) { SetValue(&Mem[kGlobalOffset + NGlobalOffset::kBlockSize], v); } -- void SetBlockPos(UInt32 v) { SetValue(&Mem[kGlobalOffset + NGlobalOffset::kBlockPos], v); } --public: -- static void SetValue(void *addr, UInt32 value) { SetValue(false, addr, value); } --private: -- UInt32 GetOperand32(const COperand *op) const; -- void SetOperand32(const COperand *op, UInt32 val); -- Byte GetOperand8(const COperand *op) const; -- void SetOperand8(const COperand *op, Byte val); -- UInt32 GetOperand(bool byteMode, const COperand *op) const; -- void SetOperand(bool byteMode, const COperand *op, UInt32 val); -- -- void DecodeArg(CMemBitDecoder &inp, COperand &op, bool byteMode); -- -- bool ExecuteCode(const CProgram *prg); -- -- #ifdef RARVM_STANDARD_FILTERS -- void ExecuteStandardFilter(int filterIndex); -- #endif -- -- Byte *Mem; -- UInt32 R[kNumRegs + 1]; // R[kNumRegs] = 0 always (speed optimization) -- UInt32 Flags; -- void ReadVmProgram(const Byte *code, UInt32 codeSize, CProgram *prg); --public: -- CVm(); -- ~CVm(); -- bool Create(); -- void PrepareProgram(const Byte *code, UInt32 codeSize, CProgram *prg); -- void SetMemory(UInt32 pos, const Byte *data, UInt32 dataSize); -- bool Execute(CProgram *prg, const CProgramInitState *initState, -- CBlockRef &outBlockRef, CRecordVector &outGlobalData); -- const Byte *GetDataPointer(UInt32 offset) const { return Mem + offset; } -- --}; -- --#endif -- --}}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp p7zip-libre_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp ---- p7zip_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp 2009-02-07 15:06:28.000000000 -0200 -+++ p7zip-libre_9.20.1/CPP/7zip/Compress/RarCodecsRegister.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,26 +0,0 @@ --// RarCodecsRegister.cpp -- --#include "StdAfx.h" -- --#include "../Common/RegisterCodec.h" -- --#include "Rar1Decoder.h" --#include "Rar2Decoder.h" --#include "Rar3Decoder.h" -- --#define CREATE_CODEC(x) static void *CreateCodec ## x() { return (void *)(ICompressCoder *)(new NCompress::NRar ## x::CDecoder); } -- --CREATE_CODEC(1) --CREATE_CODEC(2) --CREATE_CODEC(3) -- --#define RAR_CODEC(x, name) { CreateCodec ## x, 0, 0x040300 + x, L"Rar" name, 1, false } -- --static CCodecInfo g_CodecsInfo[] = --{ -- RAR_CODEC(1, L"1"), -- RAR_CODEC(2, L"2"), -- RAR_CODEC(3, L"3"), --}; -- --REGISTER_CODECS(Rar) -diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp ---- p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp 2009-05-30 17:19:19.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,133 +0,0 @@ --// Crypto/Rar20Crypto.cpp -- --#include "StdAfx.h" -- --#include "../../../C/7zCrc.h" --#include "../../../C/CpuArch.h" --#include "../../../C/RotateDefs.h" -- --#include "Rar20Crypto.h" -- --namespace NCrypto { --namespace NRar20 { -- --static const int kNumRounds = 32; -- --static const Byte InitSubstTable[256] = { -- 215, 19,149, 35, 73,197,192,205,249, 28, 16,119, 48,221, 2, 42, -- 232, 1,177,233, 14, 88,219, 25,223,195,244, 90, 87,239,153,137, -- 255,199,147, 70, 92, 66,246, 13,216, 40, 62, 29,217,230, 86, 6, -- 71, 24,171,196,101,113,218,123, 93, 91,163,178,202, 67, 44,235, -- 107,250, 75,234, 49,167,125,211, 83,114,157,144, 32,193,143, 36, -- 158,124,247,187, 89,214,141, 47,121,228, 61,130,213,194,174,251, -- 97,110, 54,229,115, 57,152, 94,105,243,212, 55,209,245, 63, 11, -- 164,200, 31,156, 81,176,227, 21, 76, 99,139,188,127, 17,248, 51, -- 207,120,189,210, 8,226, 41, 72,183,203,135,165,166, 60, 98, 7, -- 122, 38,155,170, 69,172,252,238, 39,134, 59,128,236, 27,240, 80, -- 131, 3, 85,206,145, 79,154,142,159,220,201,133, 74, 64, 20,129, -- 224,185,138,103,173,182, 43, 34,254, 82,198,151,231,180, 58, 10, -- 118, 26,102, 12, 50,132, 22,191,136,111,162,179, 45, 4,148,108, -- 161, 56, 78,126,242,222, 15,175,146, 23, 33,241,181,190, 77,225, -- 0, 46,169,186, 68, 95,237, 65, 53,208,253,168, 9, 18,100, 52, -- 116,184,160, 96,109, 37, 30,106,140,104,150, 5,204,117,112, 84 --}; -- --void CData::UpdateKeys(const Byte *data) --{ -- for (int i = 0; i < 16; i += 4) -- for (int j = 0; j < 4; j++) -- Keys[j] ^= g_CrcTable[data[i + j]]; --} -- --static void Swap(Byte *b1, Byte *b2) --{ -- Byte b = *b1; -- *b1 = *b2; -- *b2 = b; --} -- --void CData::SetPassword(const Byte *password, UInt32 passwordLen) --{ -- Keys[0] = 0xD3A3B879L; -- Keys[1] = 0x3F6D12F7L; -- Keys[2] = 0x7515A235L; -- Keys[3] = 0xA4E7F123L; -- -- Byte psw[256]; -- memset(psw, 0, sizeof(psw)); -- memcpy(psw, password, passwordLen); -- memcpy(SubstTable, InitSubstTable, sizeof(SubstTable)); -- -- for (UInt32 j = 0; j < 256; j++) -- for (UInt32 i = 0; i < passwordLen; i += 2) -- { -- UInt32 n2 = (Byte)g_CrcTable[(psw[i + 1] + j) & 0xFF]; -- UInt32 n1 = (Byte)g_CrcTable[(psw[i] - j) & 0xFF]; -- for (UInt32 k = 1; (n1 & 0xFF) != n2; n1++, k++) -- Swap(&SubstTable[n1 & 0xFF], &SubstTable[(n1 + i + k) & 0xFF]); -- } -- for (UInt32 i = 0; i < passwordLen; i+= 16) -- EncryptBlock(&psw[i]); --} -- --void CData::CryptBlock(Byte *buf, bool encrypt) --{ -- Byte inBuf[16]; -- UInt32 A, B, C, D, T, TA, TB; -- -- A = GetUi32(buf + 0) ^ Keys[0]; -- B = GetUi32(buf + 4) ^ Keys[1]; -- C = GetUi32(buf + 8) ^ Keys[2]; -- D = GetUi32(buf + 12) ^ Keys[3]; -- -- if (!encrypt) -- memcpy(inBuf, buf, sizeof(inBuf)); -- -- for (int i = 0; i < kNumRounds; i++) -- { -- UInt32 key = Keys[(encrypt ? i : (kNumRounds - 1 - i)) & 3]; -- T = ((C + rotlFixed(D, 11)) ^ key); -- TA = A ^ SubstLong(T); -- T = ((D ^ rotlFixed(C, 17)) + key); -- TB = B ^ SubstLong(T); -- A = C; -- B = D; -- C = TA; -- D = TB; -- } -- -- SetUi32(buf + 0, C ^ Keys[0]); -- SetUi32(buf + 4, D ^ Keys[1]); -- SetUi32(buf + 8, A ^ Keys[2]); -- SetUi32(buf + 12, B ^ Keys[3]); -- -- UpdateKeys(encrypt ? buf : inBuf); --} -- --STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size) --{ -- _cipher.SetPassword(data, size); -- return S_OK; --} -- --STDMETHODIMP CDecoder::Init() --{ -- return S_OK; --} -- --static const UInt32 kBlockSize = 16; -- --STDMETHODIMP_(UInt32) CDecoder::Filter(Byte *data, UInt32 size) --{ -- if (size == 0) -- return 0; -- if (size < kBlockSize) -- return kBlockSize; -- UInt32 i; -- size -= kBlockSize; -- for (i = 0; i <= size; i += kBlockSize) -- _cipher.DecryptBlock(data + i); -- return i; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h ---- p7zip_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h 2009-02-07 15:07:19.000000000 -0200 -+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/Rar20Crypto.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,50 +0,0 @@ --// Crypto/Rar20Crypto.h -- --#ifndef __CRYPTO_RAR20_CRYPTO_H --#define __CRYPTO_RAR20_CRYPTO_H -- --#include "Common/MyCom.h" -- --#include "../ICoder.h" --#include "../IPassword.h" -- --namespace NCrypto { --namespace NRar20 { -- --class CData --{ -- Byte SubstTable[256]; -- UInt32 Keys[4]; -- -- UInt32 SubstLong(UInt32 t) -- { -- return (UInt32)SubstTable[(int)t & 255] | -- ((UInt32)SubstTable[(int)(t >> 8) & 255] << 8) | -- ((UInt32)SubstTable[(int)(t >> 16) & 255] << 16) | -- ((UInt32)SubstTable[(int)(t >> 24) & 255] << 24); -- } -- void UpdateKeys(const Byte *data); -- void CryptBlock(Byte *buf, bool encrypt); --public: -- void EncryptBlock(Byte *buf) { CryptBlock(buf, true); } -- void DecryptBlock(Byte *buf) { CryptBlock(buf, false); } -- void SetPassword(const Byte *password, UInt32 passwordLen); --}; -- --class CDecoder: -- public ICompressFilter, -- public ICryptoSetPassword, -- public CMyUnknownImp --{ -- CData _cipher; --public: -- MY_UNKNOWN_IMP1(ICryptoSetPassword) -- -- STDMETHOD(Init)(); -- STDMETHOD_(UInt32, Filter)(Byte *data, UInt32 size); -- STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size); --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/RarAes.cpp p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.cpp ---- p7zip_9.20.1/CPP/7zip/Crypto/RarAes.cpp 2010-10-20 01:56:08.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.cpp 1969-12-31 21:00:00.000000000 -0300 -@@ -1,134 +0,0 @@ --// Crypto/RarAes.cpp --// Note: you must include MyAes.cpp to project to initialize AES tables -- --#include "StdAfx.h" -- --#include "RarAes.h" --#include "Sha1.h" -- --namespace NCrypto { --namespace NRar29 { -- --CDecoder::CDecoder(): -- _thereIsSalt(false), -- _needCalculate(true), -- _rar350Mode(false) --{ -- for (int i = 0; i < sizeof(_salt); i++) -- _salt[i] = 0; --} -- --STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *data, UInt32 size) --{ -- bool thereIsSaltPrev = _thereIsSalt; -- _thereIsSalt = false; -- if (size == 0) -- return S_OK; -- if (size < 8) -- return E_INVALIDARG; -- _thereIsSalt = true; -- bool same = false; -- if (_thereIsSalt == thereIsSaltPrev) -- { -- same = true; -- if (_thereIsSalt) -- { -- for (unsigned i = 0; i < sizeof(_salt); i++) -- if (_salt[i] != data[i]) -- { -- same = false; -- break; -- } -- } -- } -- for (unsigned i = 0; i < sizeof(_salt); i++) -- _salt[i] = data[i]; -- if (!_needCalculate && !same) -- _needCalculate = true; -- return S_OK; --} -- --static const unsigned kMaxPasswordLength = 127 * 2; -- --STDMETHODIMP CDecoder::CryptoSetPassword(const Byte *data, UInt32 size) --{ -- if (size > kMaxPasswordLength) -- size = kMaxPasswordLength; -- bool same = false; -- if (size == buffer.GetCapacity()) -- { -- same = true; -- for (UInt32 i = 0; i < size; i++) -- if (data[i] != buffer[i]) -- { -- same = false; -- break; -- } -- } -- if (!_needCalculate && !same) -- _needCalculate = true; -- buffer.SetCapacity(size); -- memcpy(buffer, data, size); -- return S_OK; --} -- --STDMETHODIMP CDecoder::Init() --{ -- Calculate(); -- SetKey(aesKey, kRarAesKeySize); -- AesCbc_Init(_aes + _offset, _aesInit); -- return S_OK; --} -- --void CDecoder::Calculate() --{ -- if (_needCalculate) -- { -- const unsigned kSaltSize = 8; -- -- Byte rawPassword[kMaxPasswordLength + kSaltSize]; -- -- memcpy(rawPassword, buffer, buffer.GetCapacity()); -- -- size_t rawLength = buffer.GetCapacity(); -- -- if (_thereIsSalt) -- { -- memcpy(rawPassword + rawLength, _salt, kSaltSize); -- rawLength += kSaltSize; -- } -- -- NSha1::CContext sha; -- sha.Init(); -- -- // rar reverts hash for sha. -- const unsigned kNumRounds = (1 << 18); -- unsigned i; -- for (i = 0; i < kNumRounds; i++) -- { -- sha.UpdateRar(rawPassword, rawLength, _rar350Mode); -- Byte pswNum[3] = { (Byte)i, (Byte)(i >> 8), (Byte)(i >> 16) }; -- sha.UpdateRar(pswNum, 3, _rar350Mode); -- if (i % (kNumRounds / 16) == 0) -- { -- NSha1::CContext shaTemp = sha; -- Byte digest[NSha1::kDigestSize]; -- shaTemp.Final(digest); -- _aesInit[i / (kNumRounds / 16)] = (Byte)digest[4 * 4 + 3]; -- } -- } -- /* -- // it's test message for sha -- const char *message = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"; -- sha.Update((const Byte *)message, strlen(message)); -- */ -- Byte digest[20]; -- sha.Final(digest); -- for (i = 0; i < 4; i++) -- for (unsigned j = 0; j < 4; j++) -- aesKey[i * 4 + j] = (digest[i * 4 + 3 - j]); -- } -- _needCalculate = false; --} -- --}} -diff -ruNa p7zip_9.20.1/CPP/7zip/Crypto/RarAes.h p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.h ---- p7zip_9.20.1/CPP/7zip/Crypto/RarAes.h 2009-12-21 08:46:19.000000000 -0300 -+++ p7zip-libre_9.20.1/CPP/7zip/Crypto/RarAes.h 1969-12-31 21:00:00.000000000 -0300 -@@ -1,47 +0,0 @@ --// Crypto/RarAes.h -- --#ifndef __CRYPTO_RAR_AES_H --#define __CRYPTO_RAR_AES_H -- --#include "../../../C/Aes.h" -- --#include "Common/Buffer.h" -- --#include "../IPassword.h" -- --#include "MyAes.h" -- --namespace NCrypto { --namespace NRar29 { -- --const UInt32 kRarAesKeySize = 16; -- --class CDecoder: -- public CAesCbcDecoder, -- public ICompressSetDecoderProperties2, -- public ICryptoSetPassword --{ -- Byte _salt[8]; -- bool _thereIsSalt; -- CByteBuffer buffer; -- Byte aesKey[kRarAesKeySize]; -- Byte _aesInit[AES_BLOCK_SIZE]; -- bool _needCalculate; -- bool _rar350Mode; -- -- void Calculate(); --public: -- MY_UNKNOWN_IMP2( -- ICryptoSetPassword, -- ICompressSetDecoderProperties2) -- STDMETHOD(Init)(); -- STDMETHOD(CryptoSetPassword)(const Byte *aData, UInt32 aSize); -- STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size); -- -- CDecoder(); -- void SetRar350Mode(bool rar350Mode) { _rar350Mode = rar350Mode; } --}; -- --}} -- --#endif -diff -ruNa p7zip_9.20.1/DOCS/unRarLicense.txt p7zip-libre_9.20.1/DOCS/unRarLicense.txt ---- p7zip_9.20.1/DOCS/unRarLicense.txt 2008-08-01 06:56:23.000000000 -0300 -+++ p7zip-libre_9.20.1/DOCS/unRarLicense.txt 1969-12-31 21:00:00.000000000 -0300 -@@ -1,41 +0,0 @@ -- ****** ***** ****** unRAR - free utility for RAR archives -- ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- ****** ******* ****** License for use and distribution of -- ** ** ** ** ** ** ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- ** ** ** ** ** ** FREE portable version -- ~~~~~~~~~~~~~~~~~~~~~ -- -- The source code of unRAR utility is freeware. This means: -- -- 1. All copyrights to RAR and the utility unRAR are exclusively -- owned by the author - Alexander Roshal. -- -- 2. The unRAR sources may be used in any software to handle RAR -- archives without limitations free of charge, but cannot be used -- to re-create the RAR compression algorithm, which is proprietary. -- Distribution of modified unRAR sources in separate form or as a -- part of other software is permitted, provided that it is clearly -- stated in the documentation and source comments that the code may -- not be used to develop a RAR (WinRAR) compatible archiver. -- -- 3. The unRAR utility may be freely distributed. No person or company -- may charge a fee for the distribution of unRAR without written -- permission from the copyright holder. -- -- 4. THE RAR ARCHIVER AND THE UNRAR UTILITY ARE DISTRIBUTED "AS IS". -- NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED. YOU USE AT -- YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, -- DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING -- OR MISUSING THIS SOFTWARE. -- -- 5. Installing and using the unRAR utility signifies acceptance of -- these terms and conditions of the license. -- -- 6. If you don't agree with terms of the license you must remove -- unRAR files from your storage devices and cease to use the -- utility. -- -- Thank you for your interest in RAR and unRAR. -- -- -- Alexander L. Roshal -\ No hay ningún carácter de nueva línea al final del fichero -diff -ruNa p7zip_9.20.1/makefile p7zip-libre_9.20.1/makefile ---- p7zip_9.20.1/makefile 2011-03-13 08:52:45.000000000 -0300 -+++ p7zip-libre_9.20.1/makefile 2011-09-07 15:41:14.000000000 -0300 -@@ -56,7 +56,6 @@ - $(MAKE) -C CPP/7zip/UI/Client7z depend - $(MAKE) -C CPP/7zip/UI/Console depend - $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend -- $(MAKE) -C CPP/7zip/Compress/Rar depend - $(MAKE) -C CPP/7zip/UI/GUI depend - $(MAKE) -C CPP/7zip/UI/FileManager depend - $(MAKE) -C check/my_86_filter depend -@@ -68,7 +67,6 @@ - common7z:common - $(MKDIR) bin/Codecs - $(MAKE) -C CPP/7zip/Bundles/Format7zFree all -- $(MAKE) -C CPP/7zip/Compress/Rar all - - 7z: common7z - $(MAKE) -C CPP/7zip/UI/Console all -@@ -93,7 +91,6 @@ - $(MAKE) -C CPP/7zip/UI/FileManager clean - $(MAKE) -C CPP/7zip/UI/GUI clean - $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean -- $(MAKE) -C CPP/7zip/Compress/Rar clean - $(MAKE) -C CPP/7zip/Compress/LZMA_Alone clean - $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean - $(MAKE) -C CPP/7zip/TEST/TestUI clean -diff -ruNa p7zip_9.20.1/makefile.oldmake p7zip-libre_9.20.1/makefile.oldmake ---- p7zip_9.20.1/makefile.oldmake 2011-03-13 08:53:08.000000000 -0300 -+++ p7zip-libre_9.20.1/makefile.oldmake 2011-09-07 15:41:14.000000000 -0300 -@@ -56,7 +56,6 @@ - cd CPP/7zip/UI/Client7z ; $(MAKE) depend - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/UI/FileManager ; $(MAKE) depend - cd check/my_86_filter ; $(MAKE) depend -@@ -68,7 +67,6 @@ - common7z:common - $(MKDIR) bin/Codecs - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all -- cd CPP/7zip/Compress/Rar ; $(MAKE) all - - 7z: common7z - cd CPP/7zip/UI/Console ; $(MAKE) all -@@ -93,7 +91,6 @@ - cd CPP/7zip/UI/FileManager ; $(MAKE) clean - cd CPP/7zip/UI/GUI ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean -- cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Compress/LZMA_Alone ; $(MAKE) clean - cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean - cd CPP/7zip/TEST/TestUI ; $(MAKE) clean -diff -ruNa p7zip_9.20.1/makefile.qnx_shared.so p7zip-libre_9.20.1/makefile.qnx_shared.so ---- p7zip_9.20.1/makefile.qnx_shared.so 2007-06-28 04:34:14.000000000 -0300 -+++ p7zip-libre_9.20.1/makefile.qnx_shared.so 2011-09-07 15:41:14.000000000 -0300 -@@ -1,5 +1,4 @@ - ################################################### --# makefile.machine for "7z.so , Codecs/Rar29.so" : - # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target - - OPTFLAGS=-O -diff -ruNa p7zip_9.20.1/makefile.rules p7zip-libre_9.20.1/makefile.rules ---- p7zip_9.20.1/makefile.rules 2010-11-07 13:08:51.000000000 -0300 -+++ p7zip-libre_9.20.1/makefile.rules 2011-09-07 15:41:14.000000000 -0300 -@@ -448,18 +448,6 @@ - NsisRegister.o : ../../Archive/Nsis/NsisRegister.cpp - $(CXX) $(CXXFLAGS) ../../Archive/Nsis/NsisRegister.cpp - --RarHandler.o : ../../Archive/Rar/RarHandler.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHandler.cpp --RarHeader.o : ../../Archive/Rar/RarHeader.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarHeader.cpp --RarIn.o : ../../Archive/Rar/RarIn.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarIn.cpp --RarItem.o : ../../Archive/Rar/RarItem.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarItem.cpp --RarVolumeInStream.o : ../../Archive/Rar/RarVolumeInStream.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarVolumeInStream.cpp --RarRegister.o : ../../Archive/Rar/RarRegister.cpp -- $(CXX) $(CXXFLAGS) ../../Archive/Rar/RarRegister.cpp - - UdfHandler.o : ../../Archive/Udf/UdfHandler.cpp - $(CXX) $(CXXFLAGS) ../../Archive/Udf/UdfHandler.cpp -@@ -535,10 +523,6 @@ - $(CXX) $(CXXFLAGS) ../../Crypto/7zAesRegister.cpp - WzAes.o : ../../Crypto/WzAes.cpp - $(CXX) $(CXXFLAGS) ../../Crypto/WzAes.cpp --Rar20Crypto.o : ../../Crypto/Rar20Crypto.cpp -- $(CXX) $(CXXFLAGS) ../../Crypto/Rar20Crypto.cpp --RarAes.o : ../../Crypto/RarAes.cpp -- $(CXX) $(CXXFLAGS) ../../Crypto/RarAes.cpp - HmacSha1.o : ../../Crypto/HmacSha1.cpp - $(CXX) $(CXXFLAGS) ../../Crypto/HmacSha1.cpp - Pbkdf2HmacSha1.o : ../../Crypto/Pbkdf2HmacSha1.cpp diff --git a/libre/p7zip-libre/parent-folder-icon.patch b/libre/p7zip-libre/parent-folder-icon.patch deleted file mode 100644 index da492b60f..000000000 --- a/libre/p7zip-libre/parent-folder-icon.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp ---- p7zip_9.20.1/CPP/7zip/UI/FileManager/FM_rc.cpp 2010-11-07 16:55:36.000000000 +0100 -+++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/FM_rc.cpp 2014-04-17 21:41:48.222298740 +0200 -@@ -774,8 +774,6 @@ - - ///////////////////////////////////////////////////// - --#include "res/ParentFolder.h" -- - SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : - wxPanel(parent,id) , m_frame(frame), _wList(0) - { -@@ -793,7 +791,7 @@ - int sizes[] = {150, 250, 350, -1}; - wxArrayString pathArray; - wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); -- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); -+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); - m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); - pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); - pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); -diff -ruN p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend ---- p7zip_9.20.1/CPP/7zip/UI/FileManager/makefile.depend 2011-02-19 10:33:17.000000000 +0100 -+++ p7zip_9.20.1-libre/CPP/7zip/UI/FileManager/makefile.depend 2014-04-17 21:40:56.504696275 +0200 -@@ -714,7 +714,7 @@ - res/Move2PNG.h res/DeletePNG.h res/Delete2PNG.h res/InfoPNG.h \ - res/Info2PNG.h LangUtils.h ../../../Common/Lang.h \ - ../../../Common/MyString.h ../../../Windows/ResourceString.h \ -- /usr/include/wx-2.8/wx/mstream.h res/ParentFolder.h -+ /usr/include/wx-2.8/wx/mstream.h - OpenCallback.o: OpenCallback.cpp ../../../myWindows/StdAfx.h \ - ../../../myWindows/config.h ../../../Common/MyWindows.h \ - ../../../Common/MyGuidDef.h ../../../Common/Types.h \ -- cgit v1.2.3 From a5afd365607125f650ffb2b794bd779b6250ccbf Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 3 May 2014 12:10:36 -0300 Subject: p7zip-libre: prolixing PKGBUILD --- libre/p7zip-libre/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libre/p7zip-libre') diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index ef3075c53..aff6d60b9 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -33,12 +33,12 @@ install=install mksource() { cd "${srcdir}/${_pkgname}_${pkgver}" - - # Remove nonfree unRAR utility files from the source + + # Remove nonfree unRAR utility files from the source rm -rv CPP/7zip/{Archive,Compress}/Rar - rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} - rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} - rm -v DOCS/unRarLicense.txt + rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} + rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} + rm -v DOCS/unRarLicense.txt # Remove nonfree parent folder icon rm CPP/7zip/UI/FileManager/res/ParentFolder.h @@ -47,8 +47,8 @@ mksource() { prepare() { cd "${srcdir}/${_pkgname}_${pkgver}" - # remove rar and parent folder icon references - patch -Np1 -i ../libre.patch + # remove rar and parent folder icon references + patch -Np1 -i ../libre.patch rm GUI/kde4/p7zip_compress.desktop [[ $CARCH = x86_64 ]] \ -- cgit v1.2.3 From 933fcfcbc71440730e5cbc8ce808c4e06c6ee8cd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 5 May 2014 19:29:48 -0300 Subject: p7zip-libre-9.20.1-9.4: improve description about decompression engine for RAR archives --- libre/p7zip-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre/p7zip-libre') diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index aff6d60b9..5ea50cd1a 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -8,8 +8,8 @@ pkgname=p7zip-libre _pkgname=${pkgname%-libre} pkgver=9.20.1 -pkgrel=9.3 -pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support' +pkgrel=9.4 +pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives' url='http://p7zip.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -34,7 +34,7 @@ install=install mksource() { cd "${srcdir}/${_pkgname}_${pkgver}" - # Remove nonfree unRAR utility files from the source + # Remove nonfree decompression engine for RAR archives rm -rv CPP/7zip/{Archive,Compress}/Rar rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp} rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h} -- cgit v1.2.3 From 6ad57227f7b97199555231385e709eb18baaab68 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 16 May 2014 23:01:30 -0300 Subject: fix "Maintainer:"/"Contributor:" style, add "(Arch)" for Maintainers and Contributors from Arch and remove (Parabola) for us --- cross/cross-gcc/PKGBUILD | 4 ++-- elementary/elementary-gtk-theme/PKGBUILD | 4 ++-- elementary/elementary-icons/PKGBUILD | 4 ++-- elementary/gtk-engine-equinox/PKGBUILD | 4 ++-- elementary/postler/PKGBUILD | 2 +- elementary/vala-010/PKGBUILD | 2 +- gis/grass/PKGBUILD | 6 +++--- gis/libfreexl/PKGBUILD | 2 +- gis/libspatialite/PKGBUILD | 4 ++-- gis/merkaartor/PKGBUILD | 8 ++++---- gis/qgis/PKGBUILD | 10 +++++----- gis/spatialindex/PKGBUILD | 2 +- gnu/recutils/PKGBUILD | 4 ++-- java/java-rxtx/PKGBUILD | 2 +- java/maven/PKGBUILD | 2 +- java/not-working/protobuf/PKGBUILD | 6 +++--- kernels/linux-libre-lts-knock/PKGBUILD | 14 +++++++------- kernels/linux-libre-pae/PKGBUILD | 6 +++--- kernels/linux-libre-rt/PKGBUILD | 14 +++++++------- kernels/linux-libre-xen/PKGBUILD | 6 +++--- kernels/xen-docs/PKGBUILD | 4 ++-- kernels/xen/PKGBUILD | 10 +++++----- libre-multilib/lib32-clang/PKGBUILD | 2 +- libre-multilib/lib32-mesa-demos-libre/PKGBUILD | 6 +++--- libre-multilib/lib32-sdl-libre/PKGBUILD | 8 ++++---- libre-multilib/pcsx2-libre/PKGBUILD | 6 +++--- libre/abiword-libre/PKGBUILD | 6 +++--- libre/abs/PKGBUILD | 2 +- libre/abuse-libre/PKGBUILD | 10 +++++----- libre/acpi_call-libre-lts/PKGBUILD | 8 ++++---- libre/acpi_call-libre/PKGBUILD | 8 ++++---- libre/angband-libre/PKGBUILD | 18 +++++++++--------- libre/antlr2/PKGBUILD | 4 ++-- libre/apache-ant/PKGBUILD | 2 +- libre/arora-libre/PKGBUILD | 8 ++++---- libre/atool-libre/PKGBUILD | 12 ++++++------ libre/atril-libre/PKGBUILD | 4 ++-- libre/audacious-plugins-libre/PKGBUILD | 12 ++++++------ libre/audex-libre/PKGBUILD | 10 +++++----- libre/audio-convert-libre/PKGBUILD | 6 +++--- libre/avidemux-libre/PKGBUILD | 4 ++-- libre/avidemux-libre/PKGBUILD.WIP | 4 ++-- libre/bbswitch-libre/PKGBUILD | 8 ++++---- libre/bfgminer-libre/PKGBUILD | 4 ++-- libre/bitlbee-libre/PKGBUILD | 14 +++++++------- libre/blackbox-libre/PKGBUILD | 8 ++++---- libre/bogofilter-libre/PKGBUILD | 6 +++--- libre/bumblebee-libre/PKGBUILD | 4 ++-- libre/cacert-dot-org/PKGBUILD | 4 ++-- libre/calibre-libre/PKGBUILD | 14 +++++++------- libre/cdrkit-libre/PKGBUILD | 4 ++-- libre/clementine-libre/PKGBUILD | 14 +++++++------- libre/crosstool-ng/PKGBUILD | 6 +++--- libre/cups-filters-libre/PKGBUILD | 2 +- libre/doublecmd-libre/PKGBUILD | 4 ++-- libre/dvdrip-libre/PKGBUILD | 6 +++--- libre/dvdrtools-libre/PKGBUILD | 8 ++++---- libre/ecasound-libre/PKGBUILD | 8 ++++---- libre/engrampa-libre/PKGBUILD | 4 ++-- libre/epdfview-libre/PKGBUILD | 14 +++++++------- libre/epiphany-libre/PKGBUILD | 6 +++--- libre/evince-libre/PKGBUILD | 4 ++-- libre/file-roller-libre/PKGBUILD | 4 ++-- libre/filesystem/PKGBUILD | 6 +++--- libre/gloobus-preview-libre/PKGBUILD | 2 +- libre/gnome-boxes-libre/PKGBUILD | 8 ++++---- libre/gnome-menus/PKGBUILD | 2 +- libre/gnormalize-libre/PKGBUILD | 10 +++++----- libre/grub-legacy/PKGBUILD | 8 ++++---- libre/grub/PKGBUILD | 10 +++++----- libre/gst-plugins-bad-libre/PKGBUILD | 4 ++-- libre/gstreamer0.10-bad-libre/PKGBUILD | 6 +++--- libre/gummiboot/PKGBUILD | 10 +++++----- libre/hardinfo/PKGBUILD | 4 ++-- libre/hexchat-libre/PKGBUILD | 6 +++--- libre/hplip-libre/PKGBUILD | 8 ++++---- libre/hydrogen-libre/PKGBUILD | 8 ++++---- libre/icecat-adblock-plus/PKGBUILD | 2 +- libre/icecat-firebug/PKGBUILD | 2 +- libre/icecat-noscript/PKGBUILD | 4 ++-- libre/icecat-raismth/PKGBUILD | 2 +- libre/icecat-spell-ru/PKGBUILD | 4 ++-- libre/icecat/PKGBUILD | 10 +++++----- libre/iceweasel-adblock-plus/PKGBUILD | 2 +- libre/iceweasel-firebug/PKGBUILD | 2 +- libre/iceweasel-libre/PKGBUILD | 10 +++++----- libre/iceweasel-noscript/PKGBUILD | 4 ++-- libre/iceweasel-raismth/PKGBUILD | 2 +- libre/iceweasel-spell-ru/PKGBUILD | 4 ++-- libre/kdebase-konqueror-libre/PKGBUILD | 8 ++++---- libre/kdebase-runtime-libre/PKGBUILD | 6 +++--- libre/kdelibs-libre/PKGBUILD | 6 +++--- libre/kdenetwork-kopete-libre/PKGBUILD | 4 ++-- libre/kdeutils-ark-libre/PKGBUILD | 4 ++-- libre/kile-libre/PKGBUILD | 8 ++++---- libre/kipi-plugins-libre/PKGBUILD | 10 +++++----- libre/lesspipe-libre/PKGBUILD | 6 +++--- libre/libosinfo-libre/PKGBUILD | 6 +++--- libre/libquicktime-libre/PKGBUILD | 6 +++--- libre/libretools/PKGBUILD | 2 +- libre/licenses-libre/PKGBUILD | 8 ++++---- libre/liferea-libre/PKGBUILD | 6 +++--- libre/linux-libre-api-headers/PKGBUILD | 4 ++-- libre/linux-libre-grsec/PKGBUILD | 20 ++++++++++---------- libre/linux-libre-lts/PKGBUILD | 14 +++++++------- libre/linux-libre-manpages/PKGBUILD | 6 +++--- libre/linux-libre-tools/PKGBUILD | 4 ++-- libre/linux-libre/PKGBUILD | 14 +++++++------- libre/lirc-libre/PKGBUILD | 4 ++-- libre/lsb-release/PKGBUILD | 10 +++++----- libre/luxrender-libre/PKGBUILD | 8 ++++---- libre/mc-libre/PKGBUILD | 8 ++++---- libre/mcomix-libre/PKGBUILD | 6 +++--- libre/mesa-demos-libre/PKGBUILD | 6 +++--- libre/midori-libre-gtk3/PKGBUILD | 14 +++++++------- libre/midori-libre/PKGBUILD | 12 ++++++------ libre/mime-types/PKGBUILD | 6 +++--- libre/mkisolinux/PKGBUILD | 2 +- libre/mkpxelinux/PKGBUILD | 2 +- libre/mksyslinux/PKGBUILD | 2 +- libre/mozilla-searchplugins/PKGBUILD | 6 +++--- libre/mplayer-libre-vaapi/PKGBUILD | 12 ++++++------ libre/mplayer-libre/PKGBUILD | 10 +++++----- libre/netsurf-libre/PKGBUILD | 10 +++++----- libre/nss/PKGBUILD | 6 +++--- libre/ogmrip-libre/PKGBUILD | 10 +++++----- libre/openexr-libre/PKGBUILD | 4 ++-- libre/openshot-libre/PKGBUILD | 6 +++--- libre/oss-libre/PKGBUILD | 10 +++++----- libre/p7zip-libre/PKGBUILD | 10 +++++----- libre/pacman-mirrorlist-libre/PKGBUILD | 6 +++--- libre/pacman/PKGBUILD | 4 ++-- libre/parabola-themes-slim/PKGBUILD | 4 ++-- libre/parabola-xdg-menu/PKGBUILD | 6 +++--- libre/parabolaiso/PKGBUILD | 6 +++--- libre/ponysay-libre/PKGBUILD | 8 ++++---- libre/povray-libre/PKGBUILD | 12 ++++++------ libre/psi/PKGBUILD | 4 ++-- libre/psutils-libre/PKGBUILD | 10 +++++----- libre/python-reportlab-libre/PKGBUILD | 10 +++++----- libre/qupzilla-libre/PKGBUILD | 4 ++-- libre/reflector/PKGBUILD | 4 ++-- libre/rp-pppoe-libre/PKGBUILD | 6 +++--- libre/ruby-rdiscount/PKGBUILD | 2 +- libre/sdl-libre/PKGBUILD | 10 +++++----- libre/soundkonverter-libre/PKGBUILD | 10 +++++----- libre/spectrwm-libre/PKGBUILD | 4 ++-- libre/stuntrally-data-libre/PKGBUILD | 4 ++-- libre/syslinux/PKGBUILD | 8 ++++---- libre/texlive-bin-libre/PKGBUILD | 8 ++++---- libre/texlive-core-libre/PKGBUILD | 6 +++--- libre/texlive-fontsextra-libre/PKGBUILD | 6 +++--- libre/texlive-latexextra-libre/PKGBUILD | 8 ++++---- libre/tokyocabinet/PKGBUILD | 4 ++-- libre/tp_smapi-libre-lts/PKGBUILD | 18 +++++++++--------- libre/tp_smapi-libre/PKGBUILD | 18 +++++++++--------- libre/unar/PKGBUILD | 6 +++--- libre/unzip-libre/PKGBUILD | 6 +++--- libre/usermin/PKGBUILD | 2 +- libre/vhba-module-libre/PKGBUILD | 8 ++++---- libre/vim-colorsamplerpack-libre/PKGBUILD | 6 +++--- libre/vim-runtime/PKGBUILD | 12 ++++++------ libre/webmin/PKGBUILD | 2 +- libre/wings3d-libre/PKGBUILD | 6 +++--- libre/xarchiver-libre/PKGBUILD | 8 ++++---- libre/xbmc-libre-lts/PKGBUILD | 12 ++++++------ libre/xbmc-libre/PKGBUILD | 12 ++++++------ libre/xbmc-pvr-addons-lts/PKGBUILD | 4 ++-- libre/xchat-libre/PKGBUILD | 4 ++-- libre/xmlstarlet/PKGBUILD | 6 +++--- libre/xorg-fonts-100dpi-libre/PKGBUILD | 6 +++--- libre/xorg-fonts-75dpi-libre/PKGBUILD | 4 ++-- libre/xorg-fonts-type1-libre/PKGBUILD | 2 +- libre/xscreensaver-libre/PKGBUILD | 4 ++-- libre/xsp/PKGBUILD | 4 ++-- nonprism/amarok-nonprism/PKGBUILD | 8 ++++---- nonprism/banshee-nonprism/PKGBUILD | 6 +++--- nonprism/bitlbee-libre-nonprism/PKGBUILD | 14 +++++++------- nonprism/bti-nonprism/PKGBUILD | 8 ++++---- nonprism/centerim-nonprism/PKGBUILD | 6 +++--- nonprism/choqok-nonprism/PKGBUILD | 10 +++++----- nonprism/claws-mail-nonprism/PKGBUILD | 4 ++-- nonprism/darktable-nonprism/PKGBUILD | 6 +++--- nonprism/duplicity-nonprism/PKGBUILD | 8 ++++---- nonprism/eog-plugins-nonprism/PKGBUILD | 4 ++-- nonprism/evolution-data-server-nonprism/PKGBUILD | 2 +- nonprism/gnome-online-accounts-nonprism/PKGBUILD | 4 ++-- nonprism/grilo-plugins-nonprism/PKGBUILD | 4 ++-- nonprism/gthumb-nonprism/PKGBUILD | 10 +++++----- nonprism/jitsi-nonprism/PKGBUILD | 6 +++--- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 4 ++-- nonprism/kdepim-runtime-nonprism/PKGBUILD | 6 +++--- nonprism/kipi-plugins-libre-nonprism/PKGBUILD | 10 +++++----- nonprism/openshot-libre-nonprism/PKGBUILD | 6 +++--- nonprism/pidgin-nonprism/PKGBUILD | 10 +++++----- nonprism/shotwell-nonprism/PKGBUILD | 10 +++++----- nonprism/sylpheed-nonprism/PKGBUILD | 10 +++++----- pcr/acr/PKGBUILD | 2 +- pcr/ahcpd/PKGBUILD | 2 +- pcr/android-udev/PKGBUILD | 2 +- pcr/anyremote/PKGBUILD | 6 +++--- pcr/aqsis/PKGBUILD | 6 +++--- pcr/aseprite/PKGBUILD | 4 ++-- pcr/asterisk/PKGBUILD | 6 +++--- pcr/aurvote/PKGBUILD | 2 +- pcr/auto-complete/PKGBUILD | 2 +- pcr/babeld/PKGBUILD | 2 +- pcr/bambus/PKGBUILD | 4 ++-- pcr/bamf2/PKGBUILD | 4 ++-- pcr/barnyard2/PKGBUILD | 2 +- pcr/bashmount/PKGBUILD | 2 +- pcr/batctl/PKGBUILD | 4 ++-- pcr/bibletime/PKGBUILD | 6 +++--- pcr/bison++/PKGBUILD | 2 +- pcr/bup/PKGBUILD | 4 ++-- pcr/cambozola/PKGBUILD | 2 +- pcr/cegui-0.5/PKGBUILD | 2 +- pcr/cegui-0.6/PKGBUILD | 2 +- pcr/cgdb/PKGBUILD | 2 +- pcr/cherokee/PKGBUILD | 8 ++++---- pcr/chm2pdf/PKGBUILD | 4 ++-- pcr/cinepaint-lts/PKGBUILD | 6 +++--- pcr/cjdns-git/PKGBUILD | 8 ++++---- pcr/cl-ppcre/PKGBUILD | 8 ++++---- pcr/clx-git/PKGBUILD | 2 +- pcr/coin/PKGBUILD | 8 ++++---- pcr/collada-dom/PKGBUILD | 2 +- pcr/command-not-found/PKGBUILD | 4 ++-- pcr/conky-control/PKGBUILD | 2 +- pcr/conky-lua/PKGBUILD | 10 +++++----- pcr/cpuminer/PKGBUILD | 2 +- pcr/culmus-latex/PKGBUILD | 2 +- pcr/culmus/PKGBUILD | 2 +- pcr/cw/PKGBUILD | 2 +- pcr/czmq/PKGBUILD | 4 ++-- pcr/d0_blind_id-git/PKGBUILD | 2 +- pcr/darcsver/PKGBUILD | 6 +++--- pcr/debhelper/PKGBUILD | 2 +- pcr/django-cms/PKGBUILD | 6 +++--- pcr/django-extensions/PKGBUILD | 4 ++-- pcr/django-social-auth/PKGBUILD | 2 +- pcr/django-tagging/PKGBUILD | 4 ++-- pcr/doxymacs/PKGBUILD | 2 +- pcr/dratmenu/PKGBUILD | 2 +- pcr/dropbear/PKGBUILD | 6 +++--- pcr/dsh/PKGBUILD | 2 +- pcr/econnman/PKGBUILD | 2 +- pcr/eigen3/PKGBUILD | 4 ++-- pcr/emacs-bzr/PKGBUILD | 2 +- pcr/emacs-color-theme/PKGBUILD | 4 ++-- pcr/emacs-elib/PKGBUILD | 2 +- pcr/emacs-jabber/PKGBUILD | 2 +- pcr/emacs-js2-mode/PKGBUILD | 2 +- pcr/emacs-lucid/PKGBUILD | 2 +- pcr/emacs-magit-git/PKGBUILD | 8 ++++---- pcr/emacs-newlisp/PKGBUILD | 4 ++-- pcr/emacs-org-mode-ravel-git/PKGBUILD | 2 +- pcr/emacs-org-mode/PKGBUILD | 4 ++-- pcr/emacs-tuareg-mode/PKGBUILD | 2 +- pcr/emhacks/PKGBUILD | 4 ++-- pcr/etckeeper/PKGBUILD | 4 ++-- pcr/eterm/PKGBUILD | 8 ++++---- pcr/evolution-mapi/PKGBUILD | 6 +++--- pcr/expac-relative/PKGBUILD | 6 +++--- pcr/facter/PKGBUILD | 8 ++++---- pcr/font-manager/PKGBUILD | 10 +++++----- pcr/fpdns/PKGBUILD | 2 +- pcr/frame/PKGBUILD | 2 +- pcr/freeipmi/PKGBUILD | 4 ++-- pcr/freetuxtv/PKGBUILD | 2 +- pcr/fsniper/PKGBUILD | 4 ++-- pcr/fwsnort/PKGBUILD | 2 +- pcr/galera/PKGBUILD | 4 ++-- pcr/gcc-gcj/PKGBUILD | 4 ++-- pcr/gcc-lts/PKGBUILD | 4 ++-- pcr/geis/PKGBUILD | 4 ++-- pcr/gens-gs/PKGBUILD | 2 +- pcr/gimp-pcr/PKGBUILD | 2 +- pcr/ginn/PKGBUILD | 2 +- pcr/gitflow/PKGBUILD | 4 ++-- pcr/glance/PKGBUILD | 2 +- pcr/gloobus-preview-bzr/PKGBUILD | 2 +- pcr/gmqcc-git/PKGBUILD | 2 +- pcr/gmusicbrowser/PKGBUILD | 6 +++--- pcr/gnash/PKGBUILD | 2 +- pcr/gnome-rdp/PKGBUILD | 8 ++++---- pcr/gnomeradio/PKGBUILD | 4 ++-- pcr/gnucash-docs/PKGBUILD | 2 +- pcr/gnuhealth/PKGBUILD | 4 ++-- pcr/gnuit/PKGBUILD | 4 ++-- pcr/gnuplot-py/PKGBUILD | 4 ++-- pcr/grail/PKGBUILD | 6 +++--- pcr/grass/PKGBUILD | 6 +++--- pcr/gstreamer-hplugins/PKGBUILD | 2 +- pcr/gtk-theme-numix/PKGBUILD | 2 +- pcr/gtkmm-utils/PKGBUILD | 4 ++-- pcr/gtkpacman/PKGBUILD | 6 +++--- pcr/h264enc/PKGBUILD | 6 +++--- pcr/hiawatha/PKGBUILD | 4 ++-- pcr/higan-gtk/PKGBUILD | 2 +- pcr/higan-qt/PKGBUILD | 2 +- pcr/hiredis/PKGBUILD | 2 +- pcr/httrack/PKGBUILD | 10 +++++----- pcr/hunspell-pt-br/PKGBUILD | 8 ++++---- pcr/ibus-bogo/PKGBUILD | 6 +++--- pcr/idjc/PKGBUILD | 8 ++++---- pcr/ii/PKGBUILD | 8 ++++---- pcr/imagemagick-srv/PKGBUILD | 4 ++-- pcr/inadyn-opendns/PKGBUILD | 4 ++-- pcr/ipmiutil/PKGBUILD | 4 ++-- pcr/ipycli-git/PKGBUILD | 2 +- pcr/irssi-xmpp/PKGBUILD | 2 +- pcr/jack-rack/PKGBUILD | 8 ++++---- pcr/jdee/PKGBUILD | 2 +- pcr/jitsi/PKGBUILD | 6 +++--- pcr/kamailio/PKGBUILD | 2 +- pcr/knot/PKGBUILD | 2 +- pcr/kompozer/PKGBUILD | 4 ++-- pcr/lessc/PKGBUILD | 2 +- pcr/libast/PKGBUILD | 4 ++-- pcr/libcacard/PKGBUILD | 2 +- pcr/libcgroup/PKGBUILD | 4 ++-- pcr/libdrm-nvfx/PKGBUILD | 4 ++-- pcr/libdshconfig/PKGBUILD | 2 +- pcr/libfreexl/PKGBUILD | 2 +- pcr/libibus/PKGBUILD | 10 +++++----- pcr/libnatpmp-from-social-repo/PKGBUILD | 2 +- pcr/libnatpmp/PKGBUILD | 2 +- pcr/libpng12/PKGBUILD | 8 ++++---- pcr/libpurple-minimal/PKGBUILD | 2 +- pcr/libqinfinity/PKGBUILD | 2 +- pcr/libquvi-scripts-current/PKGBUILD | 2 +- pcr/libspatialite/PKGBUILD | 4 ++-- pcr/libspnav/PKGBUILD | 4 ++-- pcr/libsquish-svn/PKGBUILD | 2 +- pcr/libtool-lts/PKGBUILD | 6 +++--- pcr/libtxc_dxtn/PKGBUILD | 2 +- pcr/libwww-hg/PKGBUILD | 2 +- pcr/lightspark/PKGBUILD | 6 +++--- pcr/lilo/PKGBUILD | 8 ++++---- pcr/litecoin-qt/PKGBUILD | 2 +- pcr/log4c/PKGBUILD | 2 +- pcr/lostfiles/PKGBUILD | 4 ++-- pcr/lprof/PKGBUILD | 6 +++--- pcr/lua-cyrussasl/PKGBUILD | 2 +- pcr/lua51-sql-mysql/PKGBUILD | 6 +++--- pcr/luabind/PKGBUILD | 8 ++++---- pcr/maliit-framework/PKGBUILD | 7 +++---- pcr/maliit-plugins/PKGBUILD | 4 ++-- pcr/mariadb-galera/PKGBUILD | 2 +- pcr/mathjax/PKGBUILD | 4 ++-- pcr/md5deep/PKGBUILD | 6 +++--- pcr/mediatomb/PKGBUILD | 10 +++++----- pcr/mesa-nvfx/PKGBUILD | 6 +++--- pcr/mimms/PKGBUILD | 2 +- pcr/minetest-git/PKGBUILD | 6 +++--- pcr/mini18n-git/PKGBUILD | 2 +- pcr/minidjvu/PKGBUILD | 4 ++-- pcr/mit-scheme/PKGBUILD | 2 +- pcr/moblock/PKGBUILD | 4 ++-- pcr/monkeysign/PKGBUILD | 2 +- pcr/monkeysphere/PKGBUILD | 2 +- pcr/mosquitto/PKGBUILD | 4 ++-- pcr/msdl/PKGBUILD | 4 ++-- pcr/multipath-tools/PKGBUILD | 12 ++++++------ pcr/multiwatch/PKGBUILD | 2 +- pcr/musescore/PKGBUILD | 6 +++--- pcr/mycron-git/PKGBUILD | 2 +- pcr/nagios-nrpe-plugin/PKGBUILD | 4 ++-- pcr/nagios-plugins/PKGBUILD | 2 +- pcr/nautilus-dropbox/PKGBUILD | 10 +++++----- pcr/netatalk/PKGBUILD | 8 ++++---- pcr/networkmanager-openswan/PKGBUILD | 2 +- pcr/networkmanager-strongswan/PKGBUILD | 4 ++-- pcr/nevow/PKGBUILD | 4 ++-- pcr/newlisp/PKGBUILD | 2 +- pcr/nexuiz-data/PKGBUILD | 12 ++++++------ pcr/nexuiz/PKGBUILD | 12 ++++++------ pcr/nfacct/PKGBUILD | 2 +- pcr/note/PKGBUILD | 2 +- pcr/nova/PKGBUILD | 2 +- pcr/npapi-vlc-git/PKGBUILD | 4 ++-- pcr/ocaml-camomile/PKGBUILD | 2 +- pcr/ocaml-pcre/PKGBUILD | 6 +++--- pcr/ocrodjvu/PKGBUILD | 4 ++-- pcr/oggfwd/PKGBUILD | 2 +- pcr/oinkmaster/PKGBUILD | 4 ++-- pcr/olsrd/PKGBUILD | 4 ++-- pcr/openchange/PKGBUILD | 6 +++--- pcr/opendnssec/PKGBUILD | 2 +- pcr/openicc/PKGBUILD | 2 +- pcr/openjdk6/PKGBUILD | 4 ++-- pcr/openswan/PKGBUILD | 2 +- pcr/opentracker/PKGBUILD | 4 ++-- pcr/otf-stix/PKGBUILD | 2 +- pcr/owncloud-app-roundcube/PKGBUILD | 2 +- pcr/owncloud/PKGBUILD | 2 +- pcr/package-query/PKGBUILD | 2 +- pcr/pacman-color/PKGBUILD | 4 ++-- pcr/pactools/PKGBUILD | 2 +- pcr/par/PKGBUILD | 4 ++-- pcr/pdsh/PKGBUILD | 4 ++-- pcr/perl-astro-suntime/PKGBUILD | 2 +- pcr/perl-crypt-dh/PKGBUILD | 6 +++--- pcr/perl-expect/PKGBUILD | 6 +++--- pcr/perl-file-find-rule/PKGBUILD | 2 +- pcr/perl-iptables-chainmgr/PKGBUILD | 2 +- pcr/perl-iptables-parse/PKGBUILD | 2 +- pcr/perl-latex-encode/PKGBUILD | 2 +- pcr/perl-net-sftp-foreign/PKGBUILD | 2 +- pcr/perl-number-compare/PKGBUILD | 2 +- pcr/perl-php-serialization/PKGBUILD | 2 +- pcr/perl-sys-mmap/PKGBUILD | 2 +- pcr/perl-text-glob/PKGBUILD | 2 +- pcr/perl-unicode-map/PKGBUILD | 2 +- pcr/perl-unix-syslog/PKGBUILD | 2 +- pcr/perl-x10/PKGBUILD | 2 +- pcr/plowshare/PKGBUILD | 4 ++-- pcr/pmount/PKGBUILD | 2 +- pcr/poco/PKGBUILD | 10 +++++----- pcr/polarssl/PKGBUILD | 2 +- pcr/prboom/PKGBUILD | 6 +++--- pcr/psad/PKGBUILD | 2 +- pcr/pspp/PKGBUILD | 4 ++-- pcr/pulledpork/PKGBUILD | 2 +- pcr/puppet/PKGBUILD | 14 +++++++------- pcr/puppet/puppet.install | 6 +++--- pcr/pybitmessage-git/PKGBUILD | 8 ++++---- pcr/pybonjour/PKGBUILD | 2 +- pcr/pycryptopp/PKGBUILD | 4 ++-- pcr/pysheng/PKGBUILD | 2 +- pcr/python-anyjson/PKGBUILD | 4 ++-- pcr/python-efl/PKGBUILD | 2 +- pcr/python-jedi/PKGBUILD | 4 ++-- pcr/python-lirc/PKGBUILD | 2 +- pcr/python-paste-deploy/PKGBUILD | 4 ++-- pcr/python-paste/PKGBUILD | 4 ++-- pcr/python-prettytable/PKGBUILD | 6 +++--- pcr/python-repoze.lru/PKGBUILD | 4 ++-- pcr/python-routes/PKGBUILD | 6 +++--- pcr/python-wsgiref/PKGBUILD | 2 +- pcr/python2-amqplib/PKGBUILD | 2 +- pcr/python2-argparse/PKGBUILD | 6 +++--- pcr/python2-carrot/PKGBUILD | 4 ++-- pcr/python2-cheetah/PKGBUILD | 6 +++--- pcr/python2-daemon/PKGBUILD | 2 +- pcr/python2-djvulibre/PKGBUILD | 6 +++--- pcr/python2-empy/PKGBUILD | 4 ++-- pcr/python2-fabric/PKGBUILD | 4 ++-- pcr/python2-iso8601/PKGBUILD | 4 ++-- pcr/python2-kombu/PKGBUILD | 2 +- pcr/python2-mock/PKGBUILD | 2 +- pcr/python2-netaddr/PKGBUILD | 4 ++-- pcr/python2-oauth2/PKGBUILD | 2 +- pcr/python2-passlib/PKGBUILD | 4 ++-- pcr/python2-pkgtools/PKGBUILD | 2 +- pcr/python2-postfix-policyd-spf/PKGBUILD | 4 ++-- pcr/python2-potr/PKGBUILD | 2 +- pcr/python2-pycha/PKGBUILD | 4 ++-- pcr/python2-pydns/PKGBUILD | 4 ++-- pcr/python2-pyspf/PKGBUILD | 4 ++-- pcr/python2-pywebdav/PKGBUILD | 4 ++-- pcr/python2-qrcode/PKGBUILD | 4 ++-- pcr/python2-qrencode/PKGBUILD | 4 ++-- pcr/python2-relatorio/PKGBUILD | 6 +++--- pcr/python2-ropemacs/PKGBUILD | 4 ++-- pcr/python2-ropemode/PKGBUILD | 4 ++-- pcr/python2-rospkg/PKGBUILD | 2 +- pcr/python2-sendfile/PKGBUILD | 2 +- pcr/python2-setuptools/PKGBUILD | 12 ++++++------ pcr/python2-ssh/PKGBUILD | 2 -- pcr/python2-suds/PKGBUILD | 2 +- pcr/python2-webob/PKGBUILD | 4 ++-- pcr/pyutil/PKGBUILD | 4 ++-- pcr/pyzenity/PKGBUILD | 4 ++-- pcr/qgis/PKGBUILD | 10 +++++----- pcr/qtkeychain/PKGBUILD | 2 +- pcr/qtoctave/PKGBUILD | 6 +++--- pcr/quack/PKGBUILD | 4 ++-- pcr/quackle/PKGBUILD | 2 +- pcr/quvi-current/PKGBUILD | 4 ++-- pcr/radicale/PKGBUILD | 2 +- pcr/radiusclient-ng/PKGBUILD | 2 +- pcr/re2-hg/PKGBUILD | 2 +- pcr/recutils/PKGBUILD | 4 ++-- pcr/renpy/PKGBUILD | 4 ++-- pcr/retroshare/PKGBUILD | 8 ++++---- pcr/rfc5766-turn-server/PKGBUILD | 2 +- pcr/rosinstall/PKGBUILD | 2 +- pcr/roundcube-carddav/PKGBUILD | 2 +- pcr/roundcube-rcguard-plugin-git/PKGBUILD | 2 +- pcr/rstudio-desktop/PKGBUILD | 4 ++-- pcr/ruby-bundler/PKGBUILD | 6 +++--- pcr/ruby-haml/PKGBUILD | 2 +- pcr/ruby-headers/PKGBUILD | 2 +- pcr/ruby-hiera-json/PKGBUILD | 2 +- pcr/ruby-hiera/PKGBUILD | 2 +- pcr/ruby-libnotify/PKGBUILD | 6 +++--- pcr/ruby-mustache/PKGBUILD | 2 +- pcr/ruby-shadow/PKGBUILD | 2 +- pcr/ruby-yard/PKGBUILD | 4 ++-- pcr/ruby1-bundler/PKGBUILD | 4 ++-- pcr/ruby1/PKGBUILD | 8 ++++---- pcr/samba4/PKGBUILD | 12 ++++++------ pcr/setuptools_darcs/PKGBUILD | 4 ++-- pcr/sfml-git/PKGBUILD | 2 +- pcr/sic/PKGBUILD | 6 +++--- pcr/sigil/PKGBUILD | 4 ++-- pcr/sipwitch/PKGBUILD | 6 +++--- pcr/skanlite/PKGBUILD | 6 +++--- pcr/sltv/PKGBUILD | 6 +++--- pcr/sltv/PKGBUILD.new | 6 +++--- pcr/snort/PKGBUILD | 10 +++++----- pcr/sobby/PKGBUILD | 2 +- pcr/softhsm/PKGBUILD | 2 +- pcr/spatialindex/PKGBUILD | 2 +- pcr/spectrum/PKGBUILD | 8 ++++---- pcr/spice-gtk3/PKGBUILD | 6 +++--- pcr/spice/PKGBUILD | 4 ++-- pcr/spnavcfg/PKGBUILD | 4 ++-- pcr/squirm/PKGBUILD | 4 ++-- pcr/startupmanager/PKGBUILD | 8 ++++---- pcr/steadyflow/PKGBUILD | 6 +++--- pcr/strongswan/PKGBUILD | 14 +++++++------- pcr/stumpwm-git/PKGBUILD | 10 +++++----- pcr/supermodel/PKGBUILD | 2 +- pcr/swig1/PKGBUILD | 6 +++--- pcr/sword-svn/PKGBUILD | 2 +- pcr/sword/PKGBUILD | 12 ++++++------ pcr/tahoe-lafs/PKGBUILD | 4 ++-- pcr/ted/PKGBUILD | 6 +++--- pcr/textext/PKGBUILD | 4 ++-- pcr/theide/PKGBUILD | 2 +- pcr/thinkfan/PKGBUILD | 4 ++-- pcr/timekpr/PKGBUILD | 2 +- pcr/tokyotyrant/PKGBUILD | 4 ++-- pcr/toluapp/PKGBUILD | 2 +- pcr/tomb/PKGBUILD | 8 ++++---- pcr/tryton/PKGBUILD | 4 ++-- pcr/trytond-account-invoice/PKGBUILD | 4 ++-- pcr/trytond-account-product/PKGBUILD | 4 ++-- pcr/trytond-account/PKGBUILD | 4 ++-- pcr/trytond-calendar/PKGBUILD | 4 ++-- pcr/trytond-carrier/PKGBUILD | 2 +- pcr/trytond-company/PKGBUILD | 4 ++-- pcr/trytond-country/PKGBUILD | 4 ++-- pcr/trytond-currency/PKGBUILD | 4 ++-- pcr/trytond-party/PKGBUILD | 4 ++-- pcr/trytond-product-price-list/PKGBUILD | 2 +- pcr/trytond-product/PKGBUILD | 4 ++-- pcr/trytond-purchase/PKGBUILD | 2 +- pcr/trytond-sale-invoice-grouping/PKGBUILD | 2 +- pcr/trytond-sale-opportunity/PKGBUILD | 2 +- pcr/trytond-sale-price-list/PKGBUILD | 2 +- pcr/trytond-sale-shipment-cost/PKGBUILD | 2 +- pcr/trytond-sale-supply-drop-shipment/PKGBUILD | 2 +- pcr/trytond-sale-supply/PKGBUILD | 2 +- pcr/trytond-sale/PKGBUILD | 2 +- pcr/trytond-stock-lot/PKGBUILD | 4 ++-- pcr/trytond-stock-supply/PKGBUILD | 2 +- pcr/trytond-stock/PKGBUILD | 4 ++-- pcr/trytond/PKGBUILD | 6 +++--- pcr/ttf-asana-math/PKGBUILD | 4 ++-- pcr/ttf-beteckna/PKGBUILD | 2 +- pcr/ttf-font-awesome/PKGBUILD | 2 +- pcr/ttf-roboto/PKGBUILD | 2 +- pcr/tunnels-git/PKGBUILD | 2 +- pcr/twinkle/PKGBUILD | 10 +++++----- pcr/uftp/PKGBUILD | 2 +- pcr/ulogd2/PKGBUILD | 2 +- pcr/ums/PKGBUILD | 2 +- pcr/unittestpp/PKGBUILD | 4 ++-- pcr/upp-svn/PKGBUILD | 2 +- pcr/vcstools/PKGBUILD | 2 +- pcr/vim-ifdef/PKGBUILD | 2 +- pcr/vuurmuur/PKGBUILD | 10 +++++----- pcr/wallchange/PKGBUILD | 4 ++-- pcr/wikipediafs/PKGBUILD | 2 +- pcr/wmii-hg/PKGBUILD | 10 +++++----- pcr/xcftools/PKGBUILD | 4 ++-- pcr/xchat-otr/PKGBUILD | 2 +- pcr/xfce-theme-greybird/PKGBUILD | 4 ++-- pcr/xfwm4-titleless/PKGBUILD | 6 +++--- pcr/xonotic-git/PKGBUILD | 6 +++--- pcr/xrdp/PKGBUILD | 8 ++++---- pcr/xtables-addons/PKGBUILD | 2 +- pcr/yate/PKGBUILD | 6 +++--- pcr/youtube-dl-current/PKGBUILD | 4 ++-- pcr/zbar/PKGBUILD | 6 +++--- pcr/zbase32/PKGBUILD | 4 ++-- pcr/zeroinstall-injector/PKGBUILD | 6 +++--- pcr/zfec/PKGBUILD | 4 ++-- pcr/zoneminder/PKGBUILD | 12 ++++++------ pcr/zsh-yaourt/PKGBUILD | 4 ++-- radio/idjc/PKGBUILD | 6 +++--- radio/jack-rack/PKGBUILD | 8 ++++---- social/ahcpd/PKGBUILD | 2 +- social/anubis/PKGBUILD | 2 +- social/babeld/PKGBUILD | 2 +- social/batctl/PKGBUILD | 4 ++-- social/bip/PKGBUILD | 2 +- social/bitcoin-daemon/PKGBUILD | 6 +++--- social/bitcoin/PKGBUILD | 2 +- social/diaspora-git/PKGBUILD | 6 +++--- social/dropbear/PKGBUILD | 6 +++--- social/haveged/PKGBUILD | 4 ++-- social/inadyn-opendns/PKGBUILD | 4 ++-- social/liblockfile/PKGBUILD | 2 +- social/libpurple-minimal/PKGBUILD | 2 +- social/lockfile-progs/PKGBUILD | 2 +- social/lua-cyrussasl/PKGBUILD | 2 +- social/monkeysphere/PKGBUILD | 2 +- social/netatalk/PKGBUILD | 10 +++++----- social/nitroshare/PKGBUILD | 4 ++-- social/olsrd/PKGBUILD | 4 ++-- social/poco/PKGBUILD | 10 +++++----- social/python-relatorio/PKGBUILD | 4 ++-- social/qxmlrpc/PKGBUILD | 2 +- social/ruby-headers/PKGBUILD | 2 +- social/sipwitch/PKGBUILD | 6 +++--- social/sobby/PKGBUILD | 2 +- social/spectrum/PKGBUILD | 4 ++-- social/squirm/PKGBUILD | 4 ++-- social/strongswan/PKGBUILD | 8 ++++---- social/tokyotyrant/PKGBUILD | 4 ++-- social/tomoyo-tools/PKGBUILD | 2 +- social/ucommon/PKGBUILD | 6 +++--- social/uftp/PKGBUILD | 4 ++-- ~coadde/mariadb/PKGBUILD | 8 ++++---- ~emulatorman/nodejs-grunt-cli/PKGBUILD | 6 +++--- ~emulatorman/nodejs-grunt/PKGBUILD | 14 +++++++------- ~lukeshu/conkeror-git/PKGBUILD | 4 ++-- ~lukeshu/conkeror-git/SRCBUILD | 4 ++-- ~lukeshu/dasm/PKGBUILD | 2 +- ~lukeshu/dunst-lukeshu-git/PKGBUILD | 2 +- ~lukeshu/libfreenect-git/PKGBUILD | 2 +- ~lukeshu/make-graph/PKGBUILD | 4 ++-- ~lukeshu/openni-all/openni-git/PKGBUILD | 6 +++--- .../openni-module-primesensor-git/PKGBUILD | 2 +- .../openni-module-sensorkinect-git/PKGBUILD | 2 +- ~lukeshu/openni-all/openni-unstable-git/PKGBUILD | 6 +++--- ~lukeshu/openni-all/openni-unstable/PKGBUILD | 6 +++--- ~lukeshu/openni-all/openni/PKGBUILD | 6 +++--- ~smv/sword-svn/PKGBUILD | 4 ++-- ~smv/xiphos-svn/PKGBUILD | 4 ++-- 645 files changed, 1563 insertions(+), 1566 deletions(-) (limited to 'libre/p7zip-libre') diff --git a/cross/cross-gcc/PKGBUILD b/cross/cross-gcc/PKGBUILD index 3d2f4de37..9cc105089 100644 --- a/cross/cross-gcc/PKGBUILD +++ b/cross/cross-gcc/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 105446 2014-02-08 10:44:41Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Allan McRae +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Allan McRae # Maintainer: Márcio Silva (Parabola) # toolchain build order: diff --git a/elementary/elementary-gtk-theme/PKGBUILD b/elementary/elementary-gtk-theme/PKGBUILD index 64f4a4511..d2495da03 100644 --- a/elementary/elementary-gtk-theme/PKGBUILD +++ b/elementary/elementary-gtk-theme/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: paterbrown -# Contributor: Daniel Milde +# Maintainer (Arch): paterbrown +# Contributor (Arch): Daniel Milde pkgname=elementary-gtk-theme _pkgname=egtk diff --git a/elementary/elementary-icons/PKGBUILD b/elementary/elementary-icons/PKGBUILD index b56c16d8b..6e6ac0c7d 100644 --- a/elementary/elementary-icons/PKGBUILD +++ b/elementary/elementary-icons/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: paterbrown -# Contributor: Josip +# Maintainer (Arch): paterbrown +# Contributor (Arch): Josip pkgname=elementary-icons _pkgname=elementary-icon-theme diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD index 11d0a717a..df6a27ea1 100644 --- a/elementary/gtk-engine-equinox/PKGBUILD +++ b/elementary/gtk-engine-equinox/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer : SpepS -# Contributor: Frikilinux +# Maintainer (Arch): SpepS +# Contributor (Arch): Frikilinux pkgname=gtk-engine-equinox pkgver=1.50 diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD index 55b523f82..894ccf408 100644 --- a/elementary/postler/PKGBUILD +++ b/elementary/postler/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Kosava +# Maintainer (Arch): Kosava pkgname=postler pkgver=0.1.1 diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD index 7712f99c4..45e6a5bad 100644 --- a/elementary/vala-010/PKGBUILD +++ b/elementary/vala-010/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Alessio Sergi +# Maintainer (Arch): Alessio Sergi pkgname=vala-010 _pkgname=vala diff --git a/gis/grass/PKGBUILD b/gis/grass/PKGBUILD index eaf1dfc5c..3ef489780 100644 --- a/gis/grass/PKGBUILD +++ b/gis/grass/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Emiliano Vavassori +# Maintainer (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor (Arch): Emiliano Vavassori pkgname=grass pkgver=6.4.2 diff --git a/gis/libfreexl/PKGBUILD b/gis/libfreexl/PKGBUILD index 533071120..ff0bfb0fc 100644 --- a/gis/libfreexl/PKGBUILD +++ b/gis/libfreexl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Bruno Gola +# Maintainer (Arch): Bruno Gola pkgname=libfreexl pkgver=1.0.0b pkgrel=1 diff --git a/gis/libspatialite/PKGBUILD b/gis/libspatialite/PKGBUILD index 13e2b8335..5199e3593 100644 --- a/gis/libspatialite/PKGBUILD +++ b/gis/libspatialite/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Brian Galey -# Contributor: Pietro Zambelli +# Maintainer (Arch): Brian Galey +# Contributor (Arch): Pietro Zambelli pkgname=libspatialite pkgver=3.0.1 pkgrel=2 diff --git a/gis/merkaartor/PKGBUILD b/gis/merkaartor/PKGBUILD index 333bc15fb..656cf4148 100644 --- a/gis/merkaartor/PKGBUILD +++ b/gis/merkaartor/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Gaetan Bisson -# Contributor: Michael Kanis -# Contributor: Paulo Freire -# Contributor: Brice Maron +# Maintainer (Arch): Gaetan Bisson +# Contributor (Arch): Michael Kanis +# Contributor (Arch): Paulo Freire +# Contributor (Arch): Brice Maron pkgname=merkaartor pkgver=0.17.2 diff --git a/gis/qgis/PKGBUILD b/gis/qgis/PKGBUILD index cb06ed0a6..9ab10a093 100644 --- a/gis/qgis/PKGBUILD +++ b/gis/qgis/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Lantald < lantald at gmx.com -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Gerardo Exequiel Pozzi -# Contributor: Eric Forgeot < http://esclinux.tk > +# Maintainer (Arch): Lantald < lantald at gmx.com +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor (Arch): Gerardo Exequiel Pozzi +# Contributor (Arch): Eric Forgeot < http://esclinux.tk > pkgname=qgis pkgver=1.8.0 diff --git a/gis/spatialindex/PKGBUILD b/gis/spatialindex/PKGBUILD index e0787808e..51ca4d275 100644 --- a/gis/spatialindex/PKGBUILD +++ b/gis/spatialindex/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Lantald +# Maintainer (Arch): Lantald pkgname=spatialindex pkgver=1.7.1 pkgrel=1 diff --git a/gnu/recutils/PKGBUILD b/gnu/recutils/PKGBUILD index 519c0fa6f..9b2dbd97c 100644 --- a/gnu/recutils/PKGBUILD +++ b/gnu/recutils/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Max Meyer -# Contributor: Sven Wick +# Maintainer (Arch): Max Meyer +# Contributor (Arch): Sven Wick # # Please fork and send me a pull request for changes to package build file(s) # Url: https://github.com/maxmeyer/archlinux-recutils diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD index ceb0d9bab..ed05e12d1 100644 --- a/java/java-rxtx/PKGBUILD +++ b/java/java-rxtx/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Luke Shumaker +# Maintainer: Luke Shumaker _pkgver=2.1-7r2-arduino4 _gitver='commit=a8cd90f8505d7c472b57550b1192fe67885dd638' diff --git a/java/maven/PKGBUILD b/java/maven/PKGBUILD index 3f8e5071d..44c9be0ab 100644 --- a/java/maven/PKGBUILD +++ b/java/maven/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker # Maintainer (Arch): Sergej Pupykin -# Contributor: William Rea +# Contributor (Arch): William Rea pkgname=maven pkgver=3.0.5 diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD index 699bde0cf..765e7972f 100644 --- a/java/not-working/protobuf/PKGBUILD +++ b/java/not-working/protobuf/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Thomas S Hatch -# Contributor: Geoffroy Carrier -# Contributor: Daniel J Griffiths +# Maintainer (Arch): Thomas S Hatch +# Contributor (Arch): Geoffroy Carrier +# Contributor (Arch): Daniel J Griffiths pkgbase=protobuf pkgname=('protobuf' 'python2-protobuf' 'java-protobuf') diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index 0c2dacf92..4d58df448 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 212335 2014-05-13 13:51:20Z bpiotrowski $ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Baechler -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Sorin-Mihai Vârgolici -# Contributor (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Thomas Baechler +# Maintainer: André Silva +# Contributor: Nicolás Reynolds +# Contributor: Sorin-Mihai Vârgolici +# Contributor: Michał Masłowski +# Contributor: Márcio Silva pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 4e15b5846..6b20f933e 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $ -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler -# Maintainer (Parabola): André Silva +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Thomas Baechler +# Maintainer: André Silva pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 8c98b3d59..823e6270d 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 204911 2014-01-31 09:59:51Z bluewind $ -# Maintainer: Joakim Hernberg -# Contributor: Ray Rashif -# Contributor: timbosa -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Joakim Hernberg +# Contributor (Arch): Ray Rashif +# Contributor (Arch): timbosa +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Thomas Baechler +# Maintainer: André Silva +# Contributor: Márcio Silva pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 98585b0d4..a79d138c7 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $ -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler -# Maintainer (Parabola): André Silva +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Thomas Baechler +# Maintainer: André Silva pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/kernels/xen-docs/PKGBUILD b/kernels/xen-docs/PKGBUILD index b3fb0899e..272652dd5 100644 --- a/kernels/xen-docs/PKGBUILD +++ b/kernels/xen-docs/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: M0Rf30 -# Maintainer (Parabola): André Silva +# Maintainer (Arch): M0Rf30 +# Maintainer: André Silva pkgname=xen-docs pkgver=4.3.1 diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index e19b5c06f..28dc5a786 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: David Sutton -# Contributor: Limao Luo -# Contributor: Luceo -# Contributor: Revellion -# Maintainer (Parabola): André Silva +# Maintainer (Arch): David Sutton +# Contributor (Arch): Limao Luo +# Contributor (Arch): Luceo +# Contributor (Arch): Revellion +# Maintainer: André Silva pkgname=xen pkgver=4.3.2 diff --git a/libre-multilib/lib32-clang/PKGBUILD b/libre-multilib/lib32-clang/PKGBUILD index e493ff5c6..cd7ff2f45 100644 --- a/libre-multilib/lib32-clang/PKGBUILD +++ b/libre-multilib/lib32-clang/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: PitBall +# Maintainer (Arch): PitBall pkgname=lib32-clang pkgver=3.4.1 diff --git a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD index 83557c0a9..feb5406dc 100644 --- a/libre-multilib/lib32-mesa-demos-libre/PKGBUILD +++ b/libre-multilib/lib32-mesa-demos-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 94584 2013-07-27 15:01:38Z lcarlier $ -# Maintainer: Jan de Groot -# Maintainer: Andreas Radke -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan de Groot +# Maintainer (Arch): Andreas Radke +# Maintainer: André Silva _pkgbasename=mesa-demos-libre pkgname=lib32-$_pkgbasename diff --git a/libre-multilib/lib32-sdl-libre/PKGBUILD b/libre-multilib/lib32-sdl-libre/PKGBUILD index 0488381ea..1b294adf0 100644 --- a/libre-multilib/lib32-sdl-libre/PKGBUILD +++ b/libre-multilib/lib32-sdl-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Allan McRae -# Contributor: dorphell -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Allan McRae +# Contributor (Arch): dorphell +# Maintainer: André Silva _pkgbasename=sdl-libre pkgname=lib32-$_pkgbasename diff --git a/libre-multilib/pcsx2-libre/PKGBUILD b/libre-multilib/pcsx2-libre/PKGBUILD index e059ce259..3703afdf8 100644 --- a/libre-multilib/pcsx2-libre/PKGBUILD +++ b/libre-multilib/pcsx2-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 105941 2014-02-19 17:17:38Z alucryd $ -# Maintainer: Maxime Gauduin -# Contributor: josephgbr -# Contributor: vEX +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): josephgbr +# Contributor (Arch): vEX _pkgname=pcsx2 pkgname=$_pkgname-libre diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 0139961e0..b49c27a84 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 209913 2014-04-08 14:24:40Z andyrtr $ -# Contributor: Giovanni Scafora -# Contributor: Maël Lavault -# Maintainer (Parabola): André Silva +# Contributor (Arch): Giovanni Scafora +# Contributor (Arch): Maël Lavault +# Maintainer: André Silva _pkgbase=abiword pkgbase=abiword-libre diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD index 657677114..cde9187b5 100644 --- a/libre/abs/PKGBUILD +++ b/libre/abs/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ -# Maintainer: Allan McRae +# Maintainer (Arch): Allan McRae pkgname=abs pkgver=2.4.4 diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 416644e81..dfffa4947 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 101370 2013-11-23 19:00:48Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Lukas Fleischer -# Contributor: jlvsimoes -# Contributor: kevin -# Contributor (Parabola): André Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Lukas Fleischer +# Contributor (Arch): jlvsimoes +# Contributor (Arch): kevin +# Contributor: André Silva _pkgname=abuse pkgname=abuse-libre diff --git a/libre/acpi_call-libre-lts/PKGBUILD b/libre/acpi_call-libre-lts/PKGBUILD index 5b24a2801..5dfcc3ed3 100644 --- a/libre/acpi_call-libre-lts/PKGBUILD +++ b/libre/acpi_call-libre-lts/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 106771 2014-03-07 14:36:15Z bpiotrowski $ -# Maintainer: Maxime Gauduin -# Contributor: mortzu -# Contributor: fnord0 -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): mortzu +# Contributor (Arch): fnord0 +# Maintainer: André Silva _pkgname=acpi_call-lts pkgname=acpi_call-libre-lts diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD index 24b89ccdc..2fd6569a6 100644 --- a/libre/acpi_call-libre/PKGBUILD +++ b/libre/acpi_call-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 108706 2014-04-01 22:24:11Z thomas $ -# Maintainer: Maxime Gauduin -# Contributor: mortzu -# Contributor: fnord0 -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): mortzu +# Contributor (Arch): fnord0 +# Maintainer: André Silva _pkgname=acpi_call pkgname=acpi_call-libre diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD index c0b222055..e8a827150 100644 --- a/libre/angband-libre/PKGBUILD +++ b/libre/angband-libre/PKGBUILD @@ -1,12 +1,12 @@ -# Maintainer: schuay -# Contributor: Mike Sampson -# Contributor: Adrian Stratulat -# Contributor: Anton Bazhenov -# Contributor: KillaB -# Contributor: Callan Barrett -# Contributor: Christian Schmidt -# Contributor: Sebastian Sareyko -# Maintainer (Parabola): André Silva +# Maintainer (Arch): schuay +# Contributor (Arch): Mike Sampson +# Contributor (Arch): Adrian Stratulat +# Contributor (Arch): Anton Bazhenov +# Contributor (Arch): KillaB +# Contributor (Arch): Callan Barrett +# Contributor (Arch): Christian Schmidt +# Contributor (Arch): Sebastian Sareyko +# Maintainer: André Silva _pkgname=angband pkgname=angband-libre diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD index 4b69536c8..5d0fd6eb0 100644 --- a/libre/antlr2/PKGBUILD +++ b/libre/antlr2/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker # Maintainer (Arch): Andrea Scarpino -# Contributor: George Giorgidze -# Contributor: Stefan Husmann +# Contributor (Arch): George Giorgidze +# Contributor (Arch): Stefan Husmann pkgbase=antlr2 pkgname=(antlr2 antlr2-{java,python2,cxx,sharp}) diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD index a2f3ab732..7601f526a 100644 --- a/libre/apache-ant/PKGBUILD +++ b/libre/apache-ant/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker # Maintainer (Arch): Paul Mattal -# Contributor: Andrew Wright +# Contributor (Arch): Andrew Wright pkgname=apache-ant pkgver=1.9.4 diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD index bf8047f24..d10fb8ade 100644 --- a/libre/arora-libre/PKGBUILD +++ b/libre/arora-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $ -# Maintainer: Gaetan Bisson -# Contributor: Pierre Schmitz -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Gaetan Bisson +# Contributor (Arch): Pierre Schmitz +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva _pkgname=arora pkgname=arora-libre diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index a4f48a7a2..2255022b6 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Jaroslav Lichtblau -# Contributor: leif_thande -# Contributor: tranquility -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): Márcio Silva -# Contributor (Parabola): André Silva +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): leif_thande +# Contributor (Arch): tranquility +# Contributor (Arch): Daniel J Griffiths +# Maintainer: Márcio Silva +# Contributor: André Silva _pkgname=atool pkgname=atool-libre diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD index 2688a84c7..a082a1bce 100644 --- a/libre/atril-libre/PKGBUILD +++ b/libre/atril-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $ -# Maintainer : Martin Wimpress -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Martin Wimpress +# Maintainer: André Silva _pkgname=atril pkgname=atril-libre diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 71513d77f..0760361a1 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 211911 2014-04-29 17:16:51Z bisson $ -# Maintainer: Gaetan Bisson -# Contributor: Alexander Fehr -# Contributor: William Rea -# Maintainer: Gaetan Bisson -# Maintainer (Parabola): Brendan Tildesley -# Contributor (Parabola): Jorge Lopez +# Maintainer (Arch): Gaetan Bisson +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): William Rea +# Maintainer (Arch): Gaetan Bisson +# Maintainer: Brendan Tildesley +# Contributor: Jorge Lopez _pkgname=audacious-plugins pkgname=audacious-plugins-libre diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD index 1f904de6a..df50539b9 100644 --- a/libre/audex-libre/PKGBUILD +++ b/libre/audex-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 106445 2014-03-03 14:51:50Z lcarlier $ -# Maintainer: Laurent Carlier -# Contributor: Andrea Scarpino -# Contributor: mightyjaym -# Contributor: moostik -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Laurent Carlier +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): mightyjaym +# Contributor (Arch): moostik +# Maintainer: André Silva _pkgname=audex pkgname=audex-libre diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD index 2f1a9e1d6..d6807b701 100644 --- a/libre/audio-convert-libre/PKGBUILD +++ b/libre/audio-convert-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau -# Contributor: Igor Galic -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Igor Galic +# Maintainer: André Silva _pkgname=audio-convert pkgname=audio-convert-libre diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD index 797135fd3..f4c612093 100644 --- a/libre/avidemux-libre/PKGBUILD +++ b/libre/avidemux-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $ -# Maintainer: Eric Bélanger -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Eric Bélanger +# Maintainer: André Silva _pkgbase=avidemux pkgbase=avidemux-libre diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP index e08bbc795..2929c4e22 100644 --- a/libre/avidemux-libre/PKGBUILD.WIP +++ b/libre/avidemux-libre/PKGBUILD.WIP @@ -1,6 +1,6 @@ # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $ -# Maintainer: Eric Bélanger -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Eric Bélanger +# Maintainer: André Silva _pkgbase=avidemux pkgbase=avidemux-libre diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 3cc49d88f..e054cb2c7 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 108708 2014-04-01 22:26:43Z thomas $ -# Maintainer: Sven-Hendrik Haase -# Contributor: M0Rf30 -# Contributor: Samsagax -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): M0Rf30 +# Contributor (Arch): Samsagax +# Maintainer: André Silva _pkgname=bbswitch pkgname=bbswitch-libre diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index ffab0642d..e29ba491e 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $ -# Maintainer: Timothy Redaelli -# Contributor: Andy Weidenbaum +# Maintainer (Arch): Timothy Redaelli +# Contributor (Arch): Andy Weidenbaum _pkgname=bfgminer pkgname=bfgminer-libre diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD index bdab365ea..0a5e6d5f8 100644 --- a/libre/bitlbee-libre/PKGBUILD +++ b/libre/bitlbee-libre/PKGBUILD @@ -1,12 +1,12 @@ # $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $ -# Contributor: FUBAR -# Contributor: simo -# Contributor: Jeff 'codemac' Mickey -# Contributor: Daniel J Griffiths -# Contributor: Gaetan Bisson -# Maintainer: Dave Reisner -# Maintainer (Parabola): Márcio Silva +# Contributor (Arch): FUBAR +# Contributor (Arch): simo +# Contributor (Arch): Jeff 'codemac' Mickey +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Gaetan Bisson +# Maintainer (Arch): Dave Reisner +# Maintainer: Márcio Silva _pkgname=bitlbee pkgname=bitlbee-libre diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD index f7e9c056c..2ab972baf 100644 --- a/libre/blackbox-libre/PKGBUILD +++ b/libre/blackbox-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: durbatuluk -# Contributor: Steve Ponsford -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): durbatuluk +# Contributor (Arch): Steve Ponsford +# Maintainer: Márcio Silva _pkgname=blackbox pkgname=${_pkgname}-libre diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD index 357e49752..086cc1cd7 100644 --- a/libre/bogofilter-libre/PKGBUILD +++ b/libre/bogofilter-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $ -# Maintainer: AndyRTR -# Contributor: tobias -# Contributor: Low Kian Seong +# Maintainer (Arch): AndyRTR +# Contributor (Arch): tobias +# Contributor (Arch): Low Kian Seong _pkgname=bogofilter pkgname=bogofilter-libre diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD index 4bebcc704..70158aac1 100644 --- a/libre/bumblebee-libre/PKGBUILD +++ b/libre/bumblebee-libre/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Sven-Hendrik Haase -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: André Silva _pkgname=bumblebee pkgname=bumblebee-libre diff --git a/libre/cacert-dot-org/PKGBUILD b/libre/cacert-dot-org/PKGBUILD index 421b46942..c55ddf9a4 100644 --- a/libre/cacert-dot-org/PKGBUILD +++ b/libre/cacert-dot-org/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Prurigro -# Contributor: Neal +# Maintainer (Arch): Prurigro +# Contributor (Arch): Neal pkgname=cacert-dot-org pkgver=20140223 diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 710f22fc2..1953532e1 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 110925 2014-05-09 19:15:05Z jelle $ -# Maintainer: Jelle van der Waa -# Maintainer: Daniel Wallace -# Contributor: Giovanni Scafora -# Contributor: Petrov Roman -# Contributor: Andrea Fagiani -# Contributor: Larry Hajali -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jelle van der Waa +# Maintainer (Arch): Daniel Wallace +# Contributor (Arch): Giovanni Scafora +# Contributor (Arch): Petrov Roman +# Contributor (Arch): Andrea Fagiani +# Contributor (Arch): Larry Hajali +# Maintainer: André Silva _pkgname=calibre pkgname=calibre-libre diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD index a598a15f6..d64f0018e 100644 --- a/libre/cdrkit-libre/PKGBUILD +++ b/libre/cdrkit-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 186761 2013-05-31 04:50:41Z allan $ -# Maintainer: Andrea Scarpino -# Contributor: Alexander Fehr +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Alexander Fehr _pkgname=cdrkit pkgname=cdrkit-libre diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index 1a693a6d5..a54b2b1ad 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 110102 2014-04-24 07:51:18Z alucryd $ -# Maintainer: Maxime Gauduin -# Contributor: Stéphane Gaudreault -# Contributor: BlackEagle -# Contributor: Dany Martineau -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Kete -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): Stéphane Gaudreault +# Contributor (Arch): BlackEagle +# Contributor (Arch): Dany Martineau +# Maintainer: André Silva +# Contributor: Kete +# Contributor: Márcio Silva _pkgname=clementine pkgname=clementine-libre diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index 5147cce61..5f4fa3ab7 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: jwwolf -# Maintainer (Parabola): fauno -# Contributor (Parabola): Márcio Silva +# Contributor (Arch): jwwolf +# Maintainer: fauno +# Contributor: Márcio Silva pkgname=crosstool-ng pkgver=1.19.0 diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index f41ab02e0..9c8ae1354 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 211789 2014-04-26 10:47:56Z andyrtr $ -# Maintainer: Andreas Radke +# Maintainer (Arch): Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD index 8bfb6697f..f5c5a16c5 100644 --- a/libre/doublecmd-libre/PKGBUILD +++ b/libre/doublecmd-libre/PKGBUILD @@ -1,7 +1,7 @@ # vim:set ft=sh: # $Id: PKGBUILD 111059 2014-05-12 18:14:06Z idevolder $ -# Maintainer: BlackIkeEagle -# Contributor: (sirocco AT ngs.ru) +# Maintainer (Arch): BlackIkeEagle +# Contributor (Arch): (sirocco AT ngs.ru) _pkgbase=doublecmd pkgbase=doublecmd-libre diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD index 06dee1752..3ec202039 100644 --- a/libre/dvdrip-libre/PKGBUILD +++ b/libre/dvdrip-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 102182 2013-12-06 12:17:23Z giovanni $ -# Maintainer: Giovanni Scafora -# Contributor: Fredrik Hammar -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Giovanni Scafora +# Contributor (Arch): Fredrik Hammar +# Maintainer: Márcio Silva _pkgname=dvdrip pkgname=dvdrip-libre diff --git a/libre/dvdrtools-libre/PKGBUILD b/libre/dvdrtools-libre/PKGBUILD index 63a3fba1d..81fb29999 100644 --- a/libre/dvdrtools-libre/PKGBUILD +++ b/libre/dvdrtools-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Alexander Baldeck -# Contributor: dorphell -# Contributor: Tom Newsom -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Alexander Baldeck +# Contributor (Arch): dorphell +# Contributor (Arch): Tom Newsom +# Maintainer: André Silva _pkgname=dvdrtools pkgname=dvdrtools-libre diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD index 480a80553..029fc5643 100644 --- a/libre/ecasound-libre/PKGBUILD +++ b/libre/ecasound-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 205044 2014-02-03 17:11:21Z schiv $ -# Maintainer: Ray Rashif -# Contributor: Eric Belanger -# Contributor: Tom Newsom -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Ray Rashif +# Contributor (Arch): Eric Belanger +# Contributor (Arch): Tom Newsom +# Maintainer: André Silva _pkgname=ecasound pkgname=ecasound-libre diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-libre/PKGBUILD index a9b18d1bf..3a5a35e21 100644 --- a/libre/engrampa-libre/PKGBUILD +++ b/libre/engrampa-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 107641 2014-03-18 11:10:40Z flexiondotorg $ -# Maintainer : Martin Wimpress -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Martin Wimpress +# Maintainer: André Silva _pkgname=engrampa pkgname=engrampa-libre diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index c3e4e2bb3..b5ab969a6 100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski -# Maintainer: Kyle Keen -# Contributor: schuay -# Contributor: Tom K -# Contributor: Thayer Williams -# Maintainer (Parabola): Márcio Silva -# Maintainer (Parabola): Michał Masłowski +# Maintainer (Arch): Bartłomiej Piotrowski +# Maintainer (Arch): Kyle Keen +# Contributor (Arch): schuay +# Contributor (Arch): Tom K +# Contributor (Arch): Thayer Williams +# Maintainer: Márcio Silva +# Maintainer: Michał Masłowski pkgname=epdfview-libre _pkgname=epdfview diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD index c26e135ba..54c337d9f 100644 --- a/libre/epiphany-libre/PKGBUILD +++ b/libre/epiphany-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 209155 2014-03-29 20:13:41Z heftig $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Jan de Groot +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=epiphany pkgname=epiphany-libre diff --git a/libre/evince-libre/PKGBUILD b/libre/evince-libre/PKGBUILD index db40386a7..d63bd54d9 100644 --- a/libre/evince-libre/PKGBUILD +++ b/libre/evince-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210357 2014-04-14 17:00:49Z jgc $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan de Groot +# Maintainer: André Silva _pkgname=evince pkgname=evince-libre diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index d49171165..61a93256a 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210597 2014-04-15 08:53:40Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot _pkgname=file-roller pkgname=file-roller-libre diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 69edeeb16..1ed9e7d46 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $ -# Maintainer: Tom Gundersen -# Maintainer (Parabola): Nicolás Reynolds -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Tom Gundersen +# Maintainer: Nicolás Reynolds +# Maintainer: André Silva pkgname=filesystem pkgver=2013.05 diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD index d620fced6..63fbe916e 100644 --- a/libre/gloobus-preview-libre/PKGBUILD +++ b/libre/gloobus-preview-libre/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $ -# Maintainer: Balló György +# Maintainer (Arch): Balló György _pkgname=gloobus-preview pkgname=gloobus-preview-libre diff --git a/libre/gnome-boxes-libre/PKGBUILD b/libre/gnome-boxes-libre/PKGBUILD index 370d9fa7b..2e516655e 100644 --- a/libre/gnome-boxes-libre/PKGBUILD +++ b/libre/gnome-boxes-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 109557 2014-04-15 23:23:01Z bgyorgy $ -# Maintainer: Balló György -# Contributor: Stefano Facchini -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Daniel Milewski +# Maintainer (Arch): Balló György +# Contributor (Arch): Stefano Facchini +# Maintainer: André Silva +# Contributor: Daniel Milewski _pkgname=gnome-boxes pkgname=gnome-boxes-libre diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD index 186473b5b..07f64ea10 100644 --- a/libre/gnome-menus/PKGBUILD +++ b/libre/gnome-menus/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: Jan de Groot +# Maintainer (Arch): Jan de Groot pkgname=gnome-menus pkgver=3.6.2 diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD index de98db9b0..36219be72 100644 --- a/libre/gnormalize-libre/PKGBUILD +++ b/libre/gnormalize-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Chris Brannon -# Contributor: Corrado Primier -# Contributor:JZsolt Varadi (karmaxxl) -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Chris Brannon +# Contributor (Arch): Corrado Primier +# Contributor (Arch):JZsolt Varadi (karmaxxl) +# Maintainer: André Silva _pkgname=gnormalize pkgname=gnormalize-libre diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD index 57aaa2840..41c63052a 100644 --- a/libre/grub-legacy/PKGBUILD +++ b/libre/grub-legacy/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $ -# Maintainer: Ronald van Haren -# Maintainer: ava1ar -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Jorge López +# Maintainer (Arch): Ronald van Haren +# Maintainer (Arch): ava1ar +# Maintainer: André Silva +# Contributor: Jorge López pkgname=grub-legacy _srcname=grub diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index c7960f88c..f105a8932 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer : Tobias Powalowski -# Maintainer : Ronald van Haren -# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgver="2.02" _GRUB_GIT_TAG="grub-2.02-beta2" diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 4d60e74ab..fe437a478 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 211613 2014-04-21 16:52:40Z jgc $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jan de Groot +# Maintainer: Márcio Silva _pkgname=gst-plugins-bad pkgname=$_pkgname-libre diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index ead094736..3c8d52824 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 207669 2014-03-12 23:48:57Z foutrelis $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): fauno -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan de Groot +# Maintainer: fauno +# Maintainer: André Silva pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD index 7792e37f9..6fe1a376b 100644 --- a/libre/gummiboot/PKGBUILD +++ b/libre/gummiboot/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 210183 2014-04-10 18:38:19Z bpiotrowski $ -# Maintainer: Tom Gundersen -# Contributor: Tobias Powalowski -# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Contributor: Mantas Mikulėnas -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Tom Gundersen +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor (Arch): Mantas Mikulėnas +# Maintainer: André Silva pkgname=gummiboot pkgver=44 diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index 99451eced..cd6fb5264 100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD @@ -1,6 +1,6 @@ # $Id$ -# Maintainer: Eric Bélanger -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Eric Bélanger +# Contributor: Márcio Silva pkgname=hardinfo pkgver=0.5.1 diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD index 4b5485ecd..336cb4dd6 100644 --- a/libre/hexchat-libre/PKGBUILD +++ b/libre/hexchat-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $ -# Maintainer: Maxime Gauduin -# Contributor: TingPing -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Maxime Gauduin +# Contributor (Arch): TingPing +# Maintainer: André Silva _pkgname=hexchat pkgname=hexchat-libre diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index d7e765c8f..89fb50fd2 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 210088 2014-04-09 19:22:29Z andyrtr $ -# Maintainer: Tom Gundersen -# Contributor : Rémy Oudompheng -# Contributor: Morgan LEFIEUX -# Maintainer (Parabola): Jorge López +# Maintainer (Arch): Tom Gundersen +# Contributor (Arch): Rémy Oudompheng +# Contributor (Arch): Morgan LEFIEUX +# Maintainer: Jorge López _pkgname=hplip pkgname=hplip-libre diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD index 95308eb70..df866a6c1 100644 --- a/libre/hydrogen-libre/PKGBUILD +++ b/libre/hydrogen-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 184270 2013-05-05 10:45:11Z schiv $ -# Maintainer: Ray Rashif -# Contributor: tobias -# Contributor: K. Piche -# Contributor: Giovanni Scafora +# Maintainer (Arch): Ray Rashif +# Contributor (Arch): tobias +# Contributor (Arch): K. Piche +# Contributor (Arch): Giovanni Scafora _pkgname=hydrogen pkgname=hydrogen-libre diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD index 183c83019..935584aa1 100644 --- a/libre/icecat-adblock-plus/PKGBUILD +++ b/libre/icecat-adblock-plus/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $ -# Maintainer: Sergej Pupykin +# Maintainer (Arch): Sergej Pupykin pkgname=icecat-adblock-plus pkgver=2.6 diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD index 838440097..ebe8a4fc9 100644 --- a/libre/icecat-firebug/PKGBUILD +++ b/libre/icecat-firebug/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ -# Maintainer: speps +# Maintainer (Arch): speps pkgname=icecat-firebug pkgver=1.12.8 diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 6e81dd7d8..4cb2d6e8e 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 110713 2014-05-05 11:29:07Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Maintainer: André Silva _pkgname=firefox-noscript pkgname=icecat-noscript diff --git a/libre/icecat-raismth/PKGBUILD b/libre/icecat-raismth/PKGBUILD index 83b545767..fb2e072d5 100644 --- a/libre/icecat-raismth/PKGBUILD +++ b/libre/icecat-raismth/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $ -# Maintainer: speps +# Maintainer (Arch): speps pkgname=icecat-raismth pkgver=4.0.1 diff --git a/libre/icecat-spell-ru/PKGBUILD b/libre/icecat-spell-ru/PKGBUILD index 5b088817a..ecb7a2607 100644 --- a/libre/icecat-spell-ru/PKGBUILD +++ b/libre/icecat-spell-ru/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Maciej Sitarz +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Maciej Sitarz pkgname=icecat-spell-ru pkgver=0.4.4 diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 4dbe6009e..5422c8a99 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva +# Maintainer: André Silva +# Maintainer: Márcio Silva # Contributor (ConnochaetOS): Henry Jensen -# Contributor (Parabola): Luke Shumaker +# Contributor: Luke Shumaker # Contributor: Figue -# Contributor (Parabola): fauno -# Contributor (Parabola): vando +# Contributor: fauno +# Contributor: vando # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD index b965a4ea1..3b2077b2a 100644 --- a/libre/iceweasel-adblock-plus/PKGBUILD +++ b/libre/iceweasel-adblock-plus/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $ -# Maintainer: Sergej Pupykin +# Maintainer (Arch): Sergej Pupykin pkgname=iceweasel-adblock-plus pkgver=2.6 diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD index 73eb462d4..2c897ae21 100644 --- a/libre/iceweasel-firebug/PKGBUILD +++ b/libre/iceweasel-firebug/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ -# Maintainer: speps +# Maintainer (Arch): speps pkgname=iceweasel-firebug pkgver=1.12.8 diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 43c166210..3a2fcaa9f 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer: André Silva +# Contributor: Márcio Silva # Contributor (ConnochaetOS): Henry Jensen -# Contributor (Parabola): Luke Shumaker -# Contributor (Parabola): fauno -# Contributor (Parabola): vando +# Contributor: Luke Shumaker +# Contributor: fauno +# Contributor: vando # Contributor (Arch): Jakub Schmidtke # Contributor: Figue # Thank you very much to the older contributors: diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index eec8b4f66..c80926c30 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 110713 2014-05-05 11:29:07Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Maintainer: André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript diff --git a/libre/iceweasel-raismth/PKGBUILD b/libre/iceweasel-raismth/PKGBUILD index ee3b9119e..377e452fd 100644 --- a/libre/iceweasel-raismth/PKGBUILD +++ b/libre/iceweasel-raismth/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $ -# Maintainer: speps +# Maintainer (Arch): speps pkgname=iceweasel-raismth pkgver=4.0.1 diff --git a/libre/iceweasel-spell-ru/PKGBUILD b/libre/iceweasel-spell-ru/PKGBUILD index b9bb8b6f9..4f759efd7 100644 --- a/libre/iceweasel-spell-ru/PKGBUILD +++ b/libre/iceweasel-spell-ru/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Maciej Sitarz +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Maciej Sitarz pkgname=iceweasel-spell-ru pkgver=0.4.4 diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 29524cd6d..0f8740785 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Pierre Schmitz -# Maintainer (Parabola): Michał Masłowski -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: Michał Masłowski +# Maintainer: André Silva _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index f87a28b47..c52b94eca 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 211506 2014-04-18 18:32:36Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Pierre Schmitz -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 89d33b41a..d0f8cd91a 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva _pkgname=kdelibs pkgname=kdelibs-libre diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 1e3d9c978..b37dac11f 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 54b58cb5d..86ec10729 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index 7bd98b5f5..f746bce87 100644 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 171256 2012-11-16 22:51:16Z allan $ -# Maintainer: Ronald van Haren -# Contributor: Damir Perisa -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Damir Perisa +# Maintainer: Michał Masłowski +# Contributor: André Silva _pkgname=kile pkgname=kile-libre diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD index 55556c4b7..644bb58fe 100644 --- a/libre/kipi-plugins-libre/PKGBUILD +++ b/libre/kipi-plugins-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $ -# Maintainer: Ronald van Haren -# Contributor: Andrea Scarpino -# Contributor: Tobias Powalowski -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Tobias Powalowski +# Maintainer: André Silva +# Contributor: Márcio Silva pkgbase=digikam _pkgname=kipi-plugins diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD index 7e33f3e8a..42b2d1569 100644 --- a/libre/lesspipe-libre/PKGBUILD +++ b/libre/lesspipe-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 83837 2013-02-05 15:58:20Z spupykin $ -# Maintainer: Angel 'angvp' Velasquez -# Contributor: solsTiCe d'Hiver -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Angel 'angvp' Velasquez +# Contributor (Arch): solsTiCe d'Hiver +# Maintainer: André Silva _pkgname=lesspipe pkgname=lesspipe-libre diff --git a/libre/libosinfo-libre/PKGBUILD b/libre/libosinfo-libre/PKGBUILD index 4d98acd64..5e759d2c2 100644 --- a/libre/libosinfo-libre/PKGBUILD +++ b/libre/libosinfo-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 109557 2014-04-15 23:23:01Z bgyorgy $ -# Maintainer: Balló György -# Contributor: Stefano Facchini -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Balló György +# Contributor (Arch): Stefano Facchini +# Maintainer: André Silva # Contributor: Daniel Milewski _pkgname=libosinfo diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 5f44d0c5d..becd2420f 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 108180 2014-03-24 09:50:56Z bpiotrowski $ -# Maintainer: Federico Cinelli -# Maintainer: Mateusz Herych -# Contributor (Parabola): Jorge Lopez +# Maintainer (Arch): Federico Cinelli +# Maintainer (Arch): Mateusz Herych +# Contributor: Jorge Lopez pkgname=libquicktime-libre _pkgname=libquicktime diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index d6dd341fe..f1fdd8ebf 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker -# Contributor: Joshua Haase +# Contributor (Arch): Joshua Haase # Contributor: fauno # Contributor: Márcio Silva diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD index 19012126c..64acec522 100644 --- a/libre/licenses-libre/PKGBUILD +++ b/libre/licenses-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 176952 2013-02-03 00:38:36Z dan $ -# Maintainer: Dan McGee -# Maintainer (Parabola): fauno -# Maintainer (Parabola): Márcio Silva -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Dan McGee +# Maintainer: fauno +# Maintainer: Márcio Silva +# Maintainer: André Silva pkgname=licenses-libre pkgver=20130203 diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index cfb211c1f..f0c0b685a 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 211690 2014-04-23 14:07:47Z eric $ -# Maintainer: Eric Bélanger -# Contributor (Parabola): bitlord -# Contributor (Parabola): André Silva +# Maintainer (Arch): Eric Bélanger +# Contributor: bitlord +# Contributor: André Silva _pkgname=liferea pkgname=liferea-libre diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD index 07cfe7988..245282994 100644 --- a/libre/linux-libre-api-headers/PKGBUILD +++ b/libre/linux-libre-api-headers/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 211667 2014-04-23 02:10:08Z allan $ -# Maintainer: Allan McRae -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Allan McRae +# Maintainer: André Silva # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index e2b33c591..6f7e20edf 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: Daniel Micay -# Contributor: Tobias Powalowski -# Contributor: Thomas Baechler -# Contributor: henning mueller -# Contributor: Thomas Dwyer http://tomd.tel -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Sorin-Mihai Vârgolici -# Contributor (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Daniel Micay +# Contributor (Arch): Tobias Powalowski +# Contributor (Arch): Thomas Baechler +# Contributor (Arch): henning mueller +# Contributor (Arch): Thomas Dwyer http://tomd.tel +# Maintainer: André Silva +# Contributor: Nicolás Reynolds +# Contributor: Sorin-Mihai Vârgolici +# Contributor: Michał Masłowski +# Contributor: Márcio Silva pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 39e7da700..ed8d7474b 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 212335 2014-05-13 13:51:20Z bpiotrowski $ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Baechler -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Sorin-Mihai Vârgolici -# Contributor (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Thomas Baechler +# Maintainer: André Silva +# Contributor: Nicolás Reynolds +# Contributor: Sorin-Mihai Vârgolici +# Contributor: Michał Masłowski +# Contributor: Márcio Silva pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index 75c0dd12f..088f6c6c1 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 209733 2014-04-01 23:08:31Z thomas $ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Baechler -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Thomas Baechler +# Maintainer: André Silva pkgname=linux-libre-manpages pkgver=3.14 diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index ef8516155..5371822a3 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $ -# Maintainer: Sébastien Luttringer -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sébastien Luttringer +# Maintainer: André Silva pkgbase=linux-libre-tools pkgname=( diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 12d843e82..d6b5755dc 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Baechler -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Sorin-Mihai Vârgolici -# Contributor (Parabola): Michał Masłowski -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Thomas Baechler +# Maintainer: André Silva +# Contributor: Nicolás Reynolds +# Contributor: Sorin-Mihai Vârgolici +# Contributor: Michał Masłowski +# Contributor: Márcio Silva pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 5a629fd29..9ca6f8ff6 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 209729 2014-04-01 21:55:59Z thomas $ -# Maintainer: Paul Mattal -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Paul Mattal +# Maintainer: André Silva _pkgbase=lirc pkgbase=lirc-libre diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD index c6cbe5863..d35195267 100644 --- a/libre/lsb-release/PKGBUILD +++ b/libre/lsb-release/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 101477 2013-11-26 10:23:04Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Malte Rabenseifner -# Contributor: John Gerritse -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva emulatorman@parabola.nu> +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Malte Rabenseifner +# Contributor (Arch): John Gerritse +# Maintainer: Michał Masłowski +# Contributor: André Silva emulatorman@parabola.nu> pkgname=lsb-release pkgver=1.4 diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index b70698a7c..d9edab932 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 108997 2014-04-09 10:03:56Z stativ $ -# Maintainer: Lukas Jirkovsky -# Contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Lukas Jirkovsky +# Contributor (Arch): flixie <69one@gmx.net> +# Contributor (Arch): Imanol Celaya +# Maintainer: Márcio Silva _pkgname=luxrender pkgname=$_pkgname-libre pkgver=1.3.1 diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index 2da038816..4ad1a0338 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 108693 2014-04-01 12:31:56Z schuay $ -# Contributor: Daniel J Griffiths -# Maintainer: schuay -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Contributor (Arch): Daniel J Griffiths +# Maintainer (Arch): schuay +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=mc pkgname=mc-libre diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index f28d7d2a3..c512a26cd 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $ -# Maintainer: schuay -# Contributor: Ray Powell -# Maintainer (Parabola): André Silva +# Maintainer (Arch): schuay +# Contributor (Arch): Ray Powell +# Maintainer: André Silva _pkgname=mcomix pkgname=mcomix-libre diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 78ecbc563..2838b51b9 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $ -# Maintainer: Jan de Groot -# Maintainer: Andreas Radke -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan de Groot +# Maintainer (Arch): Andreas Radke +# Maintainer: André Silva pkgname='mesa-demos-libre' pkgver=8.1.0 diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-libre-gtk3/PKGBUILD index 9909fe33a..938454573 100644 --- a/libre/midori-libre-gtk3/PKGBUILD +++ b/libre/midori-libre-gtk3/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 108941 2014-04-07 21:25:27Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Bartłomiej Piotrowski -# Contributor: Andreas Radke -# Contributor: rabyte -# Contributor: Johannes Krampf -# Contributor: Bartłomiej Piotrowski -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Bartłomiej Piotrowski +# Contributor (Arch): Andreas Radke +# Contributor (Arch): rabyte +# Contributor (Arch): Johannes Krampf +# Contributor (Arch): Bartłomiej Piotrowski +# Maintainer: André Silva _pkgname=midori-gtk3 pkgname=midori-libre-gtk3 diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD index fff7b0af6..9dd09b6dc 100644 --- a/libre/midori-libre/PKGBUILD +++ b/libre/midori-libre/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 108939 2014-04-07 21:17:17Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Andreas Radke -# Contributor: rabyte -# Contributor: Johannes Krampf -# Contributor: Bartłomiej Piotrowski -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Andreas Radke +# Contributor (Arch): rabyte +# Contributor (Arch): Johannes Krampf +# Contributor (Arch): Bartłomiej Piotrowski +# Maintainer: André Silva _pkgname=midori pkgname=midori-libre diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD index 31e373545..1e6d45342 100644 --- a/libre/mime-types/PKGBUILD +++ b/libre/mime-types/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 188113 2013-06-10 01:37:40Z bisson $ -# Contributor: Jan de Groot -# Contributor: Daniel J Griffiths -# Maintainer: Gaetan Bisson +# Contributor (Arch): Jan de Groot +# Contributor (Arch): Daniel J Griffiths +# Maintainer (Arch): Gaetan Bisson pkgname=mime-types pkgver=9 diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD index e2900d521..77e2c31b6 100644 --- a/libre/mkisolinux/PKGBUILD +++ b/libre/mkisolinux/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $ -# Maintainer : Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=mkisolinux pkgver=2013.05 diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD index 5596983b0..c0c30f18c 100644 --- a/libre/mkpxelinux/PKGBUILD +++ b/libre/mkpxelinux/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $ -# Maintainer : Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=mkpxelinux pkgver=2013.10 diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD index f01c844a9..4628c66e6 100644 --- a/libre/mksyslinux/PKGBUILD +++ b/libre/mksyslinux/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $ -# Maintainer : Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=mksyslinux pkgver=2013.06 diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index a55f73b0c..7df354571 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Luke Shumaker # Contributor: Figue # Contributor: Figue -# Contributor (Parabola): fauno -# Contributor (Parabola): vando -# Contributor (Parabola): Márcio Silva +# Contributor: fauno +# Contributor: vando +# Contributor: Márcio Silva # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD index 68873d749..1461c5ec7 100644 --- a/libre/mplayer-libre-vaapi/PKGBUILD +++ b/libre/mplayer-libre-vaapi/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 108189 2014-03-24 13:39:00Z foutrelis $ -# Maintainer: Evangelos Foutras -# Contributor: Ionut Biru -# Contributor: Hugo Doria -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Nicolás Reynolds -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Evangelos Foutras +# Contributor (Arch): Ionut Biru +# Contributor (Arch): Hugo Doria +# Maintainer: André Silva +# Contributor: Nicolás Reynolds +# Contributor: Márcio Silva _pkgname=mplayer-vaapi pkgname=mplayer-libre-vaapi diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 9c4dd49ab..5be143165 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 208941 2014-03-28 21:27:08Z bpiotrowski $ -# Maintainer: Ionut Biru -# Maintainer: Bartłomiej Piotrowski -# Contributor: Hugo Doria -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Ionut Biru +# Maintainer (Arch): Bartłomiej Piotrowski +# Contributor (Arch): Hugo Doria +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgbase=mplayer pkgbase=mplayer-libre diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD index 78bd1d208..21cedb2a4 100644 --- a/libre/netsurf-libre/PKGBUILD +++ b/libre/netsurf-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 110427 2014-04-29 13:53:01Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: Paulo Matias -# Contributor: Georgij Kondratjev -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Paulo Matias +# Contributor (Arch): Georgij Kondratjev +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva _pkgname=netsurf pkgname=netsurf-libre diff --git a/libre/nss/PKGBUILD b/libre/nss/PKGBUILD index 1344d4194..1676dc44d 100644 --- a/libre/nss/PKGBUILD +++ b/libre/nss/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 212171 2014-05-09 18:25:02Z jgc $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Luke Shumaker +# Maintainer (Arch): Jan de Groot +# Maintainer: André Silva +# Contributor: Luke Shumaker pkgname=nss pkgver=3.16.1 diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD index b46ec2e6b..c5af35221 100644 --- a/libre/ogmrip-libre/PKGBUILD +++ b/libre/ogmrip-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau -# Contributor: Daenyth -# Contributor: Allan McRae -# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Daenyth +# Contributor (Arch): Allan McRae +# Contributor (Arch): Vrob (Markus Heuser) mheuser@mi.fu-berlin.de +# Maintainer: André Silva _pkgname=ogmrip pkgname=ogmrip-libre diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD index 2f731939f..dfc8a8a19 100644 --- a/libre/openexr-libre/PKGBUILD +++ b/libre/openexr-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 198354 2013-10-30 14:21:29Z allan $ -# Maintainer: Tobias Powalowski -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer: André Silva _pkgname=openexr pkgname=openexr-libre diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD index bcc77b027..473592202 100644 --- a/libre/openshot-libre/PKGBUILD +++ b/libre/openshot-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $ -# Maintainer: Sergej Pupykin -# Contributor: Asa Marco -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Asa Marco +# Maintainer: André Silva _pkgname=openshot pkgname=openshot-libre diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD index 7d1777b43..a2c7b10b5 100644 --- a/libre/oss-libre/PKGBUILD +++ b/libre/oss-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $ -# Maintainer: Kyle Keen -# Contributor: Florian Pritz -# Contributor: Paulo Matias -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Kyle Keen +# Contributor (Arch): Florian Pritz +# Contributor (Arch): Paulo Matias +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva pkgname=oss-libre pkgver=4.2_2007 diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD index 5ea50cd1a..dc3e1562f 100644 --- a/libre/p7zip-libre/PKGBUILD +++ b/libre/p7zip-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $ -# Contributor: Thayer Williams -# Contributor: Hugo Doria -# Contributor: TuxSpirit 2007/11/17 21:22:36 UTC -# Contributor: Daniel J Griffiths -# Maintainer: Gaetan Bisson +# Contributor (Arch): Thayer Williams +# Contributor (Arch): Hugo Doria +# Contributor (Arch): TuxSpirit 2007/11/17 21:22:36 UTC +# Contributor (Arch): Daniel J Griffiths +# Maintainer (Arch): Gaetan Bisson pkgname=p7zip-libre _pkgname=${pkgname%-libre} diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD index 0b1ed8fad..819b737df 100644 --- a/libre/pacman-mirrorlist-libre/PKGBUILD +++ b/libre/pacman-mirrorlist-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 193769 2013-08-30 15:44:51Z dan $ -# Maintainer: Dan McGee -# Maintainer (Parabola): Esteban Carnevale -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Dan McGee +# Maintainer: Esteban Carnevale +# Maintainer: André Silva pkgname=pacman-mirrorlist-libre pkgver=$(LC_ALL=C date -u +%Y%m%d) diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 4f578475b..8fb58771b 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,7 +1,7 @@ # vim: set ts=2 sw=2 et: # $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $ -# Maintainer: Dan McGee -# Maintainer: Dave Reisner +# Maintainer (Arch): Dan McGee +# Maintainer (Arch): Dave Reisner pkgname=pacman pkgver=4.1.2 diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD index a921253da..13aec2e8a 100644 --- a/libre/parabola-themes-slim/PKGBUILD +++ b/libre/parabola-themes-slim/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Mark J.R.P. -# Contributor: Mark J.R.P. +# Maintainer (Arch): Mark J.R.P. +# Contributor (Arch): Mark J.R.P. provides=("parabola-themes-slim=$pkgver") replaces=('archlinux-themes-slim') diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD index b3085f9c3..002383804 100644 --- a/libre/parabola-xdg-menu/PKGBUILD +++ b/libre/parabola-xdg-menu/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 101138 2013-11-18 10:37:13Z spupykin $ -# Maintainer: Sergej Pupykin -# Contributor: Sergej Pupykin -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Sergej Pupykin +# Maintainer: André Silva pkgname=parabola-xdg-menu pkgver=0.7.6.2 diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD index 833a6f56b..dcc63a9ea 100644 --- a/libre/parabolaiso/PKGBUILD +++ b/libre/parabolaiso/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Gerardo Exequiel Pozzi -# Maintainer: Pierre Schmitz -# Maintainer (Parabola): Esteban Carnevale +# Maintainer (Arch): Gerardo Exequiel Pozzi +# Maintainer (Arch): Pierre Schmitz +# Maintainer: Esteban Carnevale pkgname=parabolaiso pkgver=2013.09.01 diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay-libre/PKGBUILD index 885fdb3dd..f802dc365 100644 --- a/libre/ponysay-libre/PKGBUILD +++ b/libre/ponysay-libre/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Erkin Batu Altunbaş -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Erkin Batu Altunbaş +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=ponysay pkgname=ponysay-libre diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD index c75973f60..e68afa864 100644 --- a/libre/povray-libre/PKGBUILD +++ b/libre/povray-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $ -# Maintainer: Alexander Rødseth -# Contributor: Tom Newsom -# Contributor: tobias -# Contributor: red_over_blue -# Contributor: neri +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Tom Newsom +# Contributor (Arch): tobias +# Contributor (Arch): red_over_blue +# Contributor (Arch): neri -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva # Don't build povray before 3.7 version (that ones are nonfree software) _pkgname=povray diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD index c4150075f..e5903d9d5 100644 --- a/libre/psi/PKGBUILD +++ b/libre/psi/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 196956 2013-10-21 11:28:57Z pierre $ -# Maintainer: Pierre Schmitz -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Pierre Schmitz +# Maintainer: André Silva pkgname=psi pkgver=0.15 diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD index 0d61ca098..90b204183 100644 --- a/libre/psutils-libre/PKGBUILD +++ b/libre/psutils-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 176972 2013-02-03 07:11:03Z allan $ -# Maintainer: Ronald van Haren -# Contributor: eric -# Contributor: Tom Newsom -# Maintainer (Parabola): André Silva -# Contributor (Parabola): xihh +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): eric +# Contributor (Arch): Tom Newsom +# Maintainer: André Silva +# Contributor: xihh _pkgname=psutils pkgname=psutils-libre diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD index 3ce775f9e..5f749edbd 100644 --- a/libre/python-reportlab-libre/PKGBUILD +++ b/libre/python-reportlab-libre/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 110391 2014-04-28 19:17:21Z jelle $ -# Maintainer: -# Contributor: Angel 'angvp' Velasquez -# Contributor: William Rea -# Maintainer (Parabola): fauno +# Maintainer (Arch): +# Contributor (Arch): Angel 'angvp' Velasquez +# Contributor (Arch): William Rea +# Maintainer: fauno # Contributor: borgo -# Contributor (Parabola): André Silva +# Contributor: André Silva pkgbase=python-reportlab-libre pkgname=(python2-reportlab-libre python-reportlab-libre) diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index f5956c8f2..b26cbfcc9 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 111093 2014-05-13 15:31:43Z speps $ -# Maintainer: speps -# Maintainer (Parabola): André Silva +# Maintainer (Arch): speps +# Maintainer: André Silva _pkgbase=qupzilla pkgbase=qupzilla-libre diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD index 002607a7e..3fcfa4750 100644 --- a/libre/reflector/PKGBUILD +++ b/libre/reflector/PKGBUILD @@ -1,5 +1,5 @@ -#Maintainer: Xyne -#Maintainer (Parabola): André Silva +#Maintainer (Arch): Xyne +#Maintainer: André Silva pkgname=reflector pkgver=2014 pkgrel=4 diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index dcd34bcd1..1832d8fae 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $ -# Maintainer: Daniel Isenmann -# Contributor: orelien -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Daniel Isenmann +# Contributor (Arch): orelien +# Maintainer: André Silva _pkgname=rp-pppoe pkgname=rp-pppoe-libre diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD index 449a717f7..966cf67ce 100644 --- a/libre/ruby-rdiscount/PKGBUILD +++ b/libre/ruby-rdiscount/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker -# Contributor: Massimiliano Torromeo +# Contributor (Arch): Massimiliano Torromeo _gemname=rdiscount pkgname=ruby-$_gemname diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD index 18356ed03..f9449455e 100644 --- a/libre/sdl-libre/PKGBUILD +++ b/libre/sdl-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 212210 2014-05-10 21:41:06Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Allan McRae -# Contributor: dorphell -# Maintainer (Parabola): André Silva -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Allan McRae +# Contributor (Arch): dorphell +# Maintainer: André Silva +# Maintainer: Márcio Silva # Maintainer (Connochaetos): Henry Jensen pkgname=sdl-libre diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index 364d1fa64..c0aea726b 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 109579 2014-04-16 10:34:29Z stativ $ -# Maintainer: Lukas Jirkovsky -# Contributor: Mateusz Herych -# Contributor: Eric Belanger -# Contributor: Darwin Bautista -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Lukas Jirkovsky +# Contributor (Arch): Mateusz Herych +# Contributor (Arch): Eric Belanger +# Contributor (Arch): Darwin Bautista +# Maintainer: André Silva _pkgname=soundkonverter pkgname=soundkonverter-libre diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD index 2a45650fe..ed632759b 100644 --- a/libre/spectrwm-libre/PKGBUILD +++ b/libre/spectrwm-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 110857 2014-05-08 17:25:29Z kkeen $ -# Maintainer: Kyle Keen -# Contributor: Christoph Zeiler +# Maintainer (Arch): Kyle Keen +# Contributor (Arch): Christoph Zeiler _pkgname=spectrwm pkgname=spectrwm-libre diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD index c63af4d5c..2ca986851 100644 --- a/libre/stuntrally-data-libre/PKGBUILD +++ b/libre/stuntrally-data-libre/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Sven-Hendrik Haase -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: André Silva pkgname=stuntrally-data-libre _pkgname=stuntrally-data diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 6b3b53b77..05c761fe1 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Bächler -# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Tobias Powalowski +# Maintainer (Arch): Thomas Bächler +# Contributor (Arch): Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer: André Silva pkgname="syslinux" pkgver="6.02" diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index f3b5eca26..03d829d53 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 211863 2014-04-28 15:07:05Z jgc $ -# Maintainer: Rémy Oudompheng -# Contributor: francois -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Maintainer (Arch): Rémy Oudompheng +# Contributor (Arch): francois +# Maintainer: Michał Masłowski +# Contributor: André Silva pkgname=texlive-bin-libre pkgver=2013.30973 diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index e56677d76..a5455426c 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Rémy Oudompheng -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Maintainer (Arch): Rémy Oudompheng +# Maintainer: Michał Masłowski +# Contributor: André Silva pkgname=texlive-core-libre _pkgname=texlive-core diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 40ef79a37..74969b3ef 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Rémy Oudompheng -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Maintainer (Arch): Rémy Oudompheng +# Maintainer: Michał Masłowski +# Contributor: André Silva pkgname=texlive-fontsextra-libre _pkgname=texlive-fontsextra diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index 48756201a..7287e0019 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 207649 2014-03-12 22:58:16Z remy $ -# Maintainer: Firmicus -# Maintainer: Rémy Oudompheng -# Maintainer (Parabola): Michał Masłowski -# Contributor (Parabola): André Silva +# Maintainer (Arch): Firmicus +# Maintainer (Arch): Rémy Oudompheng +# Maintainer: Michał Masłowski +# Contributor: André Silva pkgname=texlive-latexextra-libre _pkgname=texlive-latexextra diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD index 1add6c535..2ac531c2e 100644 --- a/libre/tokyocabinet/PKGBUILD +++ b/libre/tokyocabinet/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Mark Foxwell -# Contributor: Nicolas Martyanoff +# Maintainer (Arch): Mark Foxwell +# Contributor (Arch): Nicolas Martyanoff pkgname=tokyocabinet pkgver=1.4.48 diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 75ba8520d..1e1a2eabc 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -1,13 +1,13 @@ # $Id: PKGBUILD 106775 2014-03-07 14:36:25Z bpiotrowski $ -# Maintainer: Lukas Fleischer -# Contributor: xduugu -# Contributor: nh2 -# Contributor: Steven Davidovitz -# Contributor: Nick B -# Contributor: Christof Musik -# Contributor: Stefan Rupp -# Contributor: Ignas Anikevicius -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): xduugu +# Contributor (Arch): nh2 +# Contributor (Arch): Steven Davidovitz +# Contributor (Arch): Nick B +# Contributor (Arch): Christof Musik +# Contributor (Arch): Stefan Rupp +# Contributor (Arch): Ignas Anikevicius +# Maintainer: André Silva pkgname=tp_smapi-libre-lts _pkgname=tp_smapi diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index c72249779..d52136e63 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,13 +1,13 @@ # $Id: PKGBUILD 108712 2014-04-01 22:34:00Z thomas $ -# Maintainer: Lukas Fleischer -# Contributor: xduugu -# Contributor: nh2 -# Contributor: Steven Davidovitz -# Contributor: Nick B -# Contributor: Christof Musik -# Contributor: Stefan Rupp -# Contributor: Ignas Anikevicius -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): xduugu +# Contributor (Arch): nh2 +# Contributor (Arch): Steven Davidovitz +# Contributor (Arch): Nick B +# Contributor (Arch): Christof Musik +# Contributor (Arch): Stefan Rupp +# Contributor (Arch): Ignas Anikevicius +# Maintainer: André Silva _pkgname=tp_smapi pkgname=tp_smapi-libre diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 5ad3e3814..2c8dbdb16 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Cedric Girard -# Contributor: N30N -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Cedric Girard +# Contributor (Arch): N30N +# Maintainer: André Silva pkgname=unar pkgver=1.8.1 diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD index 2c4ce4150..6b3cc76b0 100644 --- a/libre/unzip-libre/PKGBUILD +++ b/libre/unzip-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $ -# Maintainer: -# Contributor: Douglas Soares de Andrade -# Contributor: Robson Peixoto +# Maintainer (Arch): +# Contributor (Arch): Douglas Soares de Andrade +# Contributor (Arch): Robson Peixoto _pkgname=unzip pkgname=unzip-libre diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD index 578853285..3eaee9fc1 100644 --- a/libre/usermin/PKGBUILD +++ b/libre/usermin/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 208134 2014-03-18 07:25:18Z tpowa $ -# Maintainer: Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=usermin pkgver=1.590 pkgrel=1 diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 49d31f45e..e94daedc2 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 108714 2014-04-01 22:36:58Z thomas $ -# Maintainer: Ray Rashif -# Contributor: Mateusz Herych -# Contributor: Charles Lindsay -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Ray Rashif +# Contributor (Arch): Mateusz Herych +# Contributor (Arch): Charles Lindsay +# Maintainer: André Silva _pkgname=vhba-module pkgname=vhba-module-libre diff --git a/libre/vim-colorsamplerpack-libre/PKGBUILD b/libre/vim-colorsamplerpack-libre/PKGBUILD index 3bfc552ff..0e9e6e2c8 100644 --- a/libre/vim-colorsamplerpack-libre/PKGBUILD +++ b/libre/vim-colorsamplerpack-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 95528 2013-08-13 11:23:39Z svenstaro $ -# Contributor: Aaron Griffin -# Maintainer: Sven-Hendrik Haase -# Maintainer (Parabola): André Silva +# Contributor (Arch): Aaron Griffin +# Maintainer (Arch): Sven-Hendrik Haase +# Maintainer: André Silva _pkgname=vim-colorsamplerpack pkgname=vim-colorsamplerpack-libre diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD index 893907179..3f5537820 100644 --- a/libre/vim-runtime/PKGBUILD +++ b/libre/vim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Thomas Dziedzic -# Contributor: Jan "heftig" Steffens -# Contributor: tobias [ tobias at archlinux org ] -# Contributor: Daniel J Griffiths -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Thomas Dziedzic +# Contributor (Arch): Jan "heftig" Steffens +# Contributor (Arch): tobias [ tobias at archlinux org ] +# Contributor (Arch): Daniel J Griffiths +# Maintainer: André Silva +# Contributor: Márcio Silva pkgbase=vim pkgname=vim-runtime diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 3cb9e787c..bc9307bcc 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 208132 2014-03-18 07:22:29Z tpowa $ -# Maintainer: Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=webmin pkgver=1.680 pkgrel=1 diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD index 1f750dfc4..5970c5bcb 100644 --- a/libre/wings3d-libre/PKGBUILD +++ b/libre/wings3d-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $ -# Maintainer: Alexander Rødseth -# Contributor: kappa -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): kappa +# Maintainer: Márcio Silva _name=wings _pkgname=${_name}3d diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index f97fcf31c..a6965af8d 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 111012 2014-05-12 01:13:40Z bgyorgy $ -# Maintainer: Balló György -# Contributor: Alexander Fehr -# Contributor: Andrew Simmons -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Balló György +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): Andrew Simmons +# Maintainer: André Silva _pkgname=xarchiver pkgname=xarchiver-libre diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index 468dcb12d..bd0ab5108 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Sergej Pupykin -# Contributor: Brad Fanella -# Contributor: [vEX] -# Contributor: Zeqadious -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Brad Fanella +# Contributor (Arch): [vEX] +# Contributor (Arch): Zeqadious +# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Maintainer: André Silva _prefix=/usr diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index bdbeaa430..1aff83340 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,10 +1,10 @@ # $Id: PKGBUILD 110974 2014-05-11 14:59:58Z idevolder $ -# Maintainer: Sergej Pupykin -# Contributor: Brad Fanella -# Contributor: [vEX] -# Contributor: Zeqadious -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Brad Fanella +# Contributor (Arch): [vEX] +# Contributor (Arch): Zeqadious +# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Maintainer: André Silva _prefix=/usr diff --git a/libre/xbmc-pvr-addons-lts/PKGBUILD b/libre/xbmc-pvr-addons-lts/PKGBUILD index 540e90c45..7b647d7d9 100644 --- a/libre/xbmc-pvr-addons-lts/PKGBUILD +++ b/libre/xbmc-pvr-addons-lts/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 110811 2014-05-07 15:05:32Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Maintainer: André Silva _pkgname=xbmc-pvr-addons pkgname=xbmc-pvr-addons-lts diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 4f962dcb3..1214dc947 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $ -# Maintainer: Eric Bélanger +# Maintainer (Arch): Eric Bélanger # Maintainer (ConnochaetOS): Henry Jensen -# Maintainer (Parabola): André Silva +# Maintainer: André Silva _pkgname=xchat pkgname=xchat-libre diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD index a06daf063..76595486f 100644 --- a/libre/xmlstarlet/PKGBUILD +++ b/libre/xmlstarlet/PKGBUILD @@ -1,7 +1,7 @@ # From https://aur.archlinux.org/packages.php?ID=20101. -# Maintainer: PyroPeter -# Contributor: BlackEagle -# Contributor: chochem +# Maintainer (Arch): PyroPeter +# Contributor (Arch): BlackEagle +# Contributor (Arch): chochem pkgname=xmlstarlet pkgver=1.3.1 diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD index 3f88f1cee..066904a5a 100644 --- a/libre/xorg-fonts-100dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot -# Maintainer (Parabola): fauno +# Maintainer (Arch): Alexander Baldeck +# Contributor (Arch): Jan de Groot +# Maintainer: fauno pkgname=xorg-fonts-100dpi-libre pkgver=1.0.3 pkgrel=2 diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD index c262229fc..6921b4ccc 100644 --- a/libre/xorg-fonts-75dpi-libre/PKGBUILD +++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $ -# Maintainer: Alexander Baldeck -# Contributor: Jan de Groot +# Maintainer (Arch): Alexander Baldeck +# Contributor (Arch): Jan de Groot pkgname=xorg-fonts-75dpi-libre pkgver=1.0.3 pkgrel=2 diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD index 4904a4477..e38cc63e3 100644 --- a/libre/xorg-fonts-type1-libre/PKGBUILD +++ b/libre/xorg-fonts-type1-libre/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 150375 2012-02-17 09:54:09Z allan $ -# Maintainer: Jan de Groot +# Maintainer (Arch): Jan de Groot pkgname=xorg-fonts-type1-libre pkgver=7.4 diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 8ab5ec06a..7fb26c711 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $ -# Maintainer: Eric Bélanger -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Eric Bélanger +# Maintainer: André Silva _pkgname=xscreensaver pkgname=xscreensaver-libre diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD index ef6fe97c2..93867938d 100644 --- a/libre/xsp/PKGBUILD +++ b/libre/xsp/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $ -# Maintainer: Daniel Isenmann -# Contributor: Tobias Kieslich +# Maintainer (Arch): Daniel Isenmann +# Contributor (Arch): Tobias Kieslich pkgname=xsp pkgver=3.0.11 diff --git a/nonprism/amarok-nonprism/PKGBUILD b/nonprism/amarok-nonprism/PKGBUILD index ca28f747b..6bf592d5b 100644 --- a/nonprism/amarok-nonprism/PKGBUILD +++ b/nonprism/amarok-nonprism/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 211520 2014-04-19 11:27:02Z andrea $ -# Maintainer: Ronald van Haren -# Contributor: Andrea Scarpino -# Contributor: damir -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): damir +# Maintainer: André Silva _pkgname=amarok pkgname=amarok-nonprism diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD index 2958d3d2f..c5b20fd7c 100644 --- a/nonprism/banshee-nonprism/PKGBUILD +++ b/nonprism/banshee-nonprism/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $ -# Maintainer: Daniel Isenmann -# Contributor: György Balló -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Daniel Isenmann +# Contributor (Arch): György Balló +# Maintainer: André Silva _pkgname=banshee pkgname=banshee-nonprism diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD index 202153eb8..bb2ad0f09 100644 --- a/nonprism/bitlbee-libre-nonprism/PKGBUILD +++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD @@ -1,12 +1,12 @@ # $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $ -# Contributor: FUBAR -# Contributor: simo -# Contributor: Jeff 'codemac' Mickey -# Contributor: Daniel J Griffiths -# Contributor: Gaetan Bisson -# Maintainer: Dave Reisner -# Maintainer (Parabola): Márcio Silva +# Contributor (Arch): FUBAR +# Contributor (Arch): simo +# Contributor (Arch): Jeff 'codemac' Mickey +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Gaetan Bisson +# Maintainer (Arch): Dave Reisner +# Maintainer: Márcio Silva _pkgname=bitlbee pkgname=bitlbee-libre-nonprism diff --git a/nonprism/bti-nonprism/PKGBUILD b/nonprism/bti-nonprism/PKGBUILD index 7a8b3d762..b7df4c6a2 100644 --- a/nonprism/bti-nonprism/PKGBUILD +++ b/nonprism/bti-nonprism/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 105298 2014-02-04 18:30:40Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau -# Contributor: Kaiting Chen -# Contributor: uvok -# Contributor: Urist <9362773 at gmail.com> +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Kaiting Chen +# Contributor (Arch): uvok +# Contributor (Arch): Urist <9362773 at gmail.com> _pkgname=bti pkgname=bti-nonprism diff --git a/nonprism/centerim-nonprism/PKGBUILD b/nonprism/centerim-nonprism/PKGBUILD index abe91928d..0c2b3163a 100644 --- a/nonprism/centerim-nonprism/PKGBUILD +++ b/nonprism/centerim-nonprism/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Sergej Pupykin -# Contributor: Aaron Griffin -# Contributor: shild +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Aaron Griffin +# Contributor (Arch): shild _pkgname=centerim pkgname=centerim-nonprism diff --git a/nonprism/choqok-nonprism/PKGBUILD b/nonprism/choqok-nonprism/PKGBUILD index 915b51a56..62d23478c 100644 --- a/nonprism/choqok-nonprism/PKGBUILD +++ b/nonprism/choqok-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 96779 2013-09-04 22:09:55Z andrea $ -# Maintainer: Peter Richard Lewis -# Contributor: Andrea Scarpino -# Contributor: Emanuele Rossi -# Contributor: Bram Schoenmakers -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Peter Richard Lewis +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Emanuele Rossi +# Contributor (Arch): Bram Schoenmakers +# Maintainer: Márcio Silva _pkgname=choqok pkgname=choqok-nonprism diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD index 4d8f8abac..f8af801a7 100644 --- a/nonprism/claws-mail-nonprism/PKGBUILD +++ b/nonprism/claws-mail-nonprism/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 211817 2014-04-27 16:25:16Z andyrtr $ -# Maintainer: Andreas Radke -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Andreas Radke +# Maintainer: Márcio Silva _pkgname=claws-mail pkgname=$_pkgname-nonprism diff --git a/nonprism/darktable-nonprism/PKGBUILD b/nonprism/darktable-nonprism/PKGBUILD index 30940d7cb..081ecfa1e 100644 --- a/nonprism/darktable-nonprism/PKGBUILD +++ b/nonprism/darktable-nonprism/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 110040 2014-04-23 14:50:57Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer: Christian Himpel -# Contributor: Johannes Hanika +# Maintainer (Arch): Sergej Pupykin +# Maintainer (Arch): Christian Himpel +# Contributor (Arch): Johannes Hanika _pkgname=darktable pkgname=darktable-nonprism diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD index 3e8017704..1c7612999 100644 --- a/nonprism/duplicity-nonprism/PKGBUILD +++ b/nonprism/duplicity-nonprism/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 110919 2014-05-09 15:34:16Z lfleischer $ -# Maintainer: Lukas Fleischer -# Contributor: Kaiting Chen -# Contributor: Aaron Schaefer -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): Kaiting Chen +# Contributor (Arch): Aaron Schaefer +# Maintainer: André Silva _pkgname=duplicity pkgname=duplicity-nonprism diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD index 67951e687..8c69eb66a 100644 --- a/nonprism/eog-plugins-nonprism/PKGBUILD +++ b/nonprism/eog-plugins-nonprism/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210576 2014-04-15 08:00:45Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Maintainer: Márcio Silva _pkgname=eog-plugins pkgname=eog-plugins-nonprism diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD index b9947bea1..63559b0e3 100644 --- a/nonprism/evolution-data-server-nonprism/PKGBUILD +++ b/nonprism/evolution-data-server-nonprism/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 212323 2014-05-12 18:57:42Z jgc $ -# Maintainer: Jan de Groot +# Maintainer (Arch): Jan de Groot _pkgname=evolution-data-server pkgname=evolution-data-server-nonprism diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD index 530581e35..624d7eb46 100644 --- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD +++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 211221 2014-04-18 11:14:01Z heftig $ -# Maintainer: Ionut Biru -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Ionut Biru +# Maintainer: Márcio Silva _pkgname=gnome-online-accounts pkgname=gnome-online-accounts-nonprism diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD index 69034a569..f2b675538 100644 --- a/nonprism/grilo-plugins-nonprism/PKGBUILD +++ b/nonprism/grilo-plugins-nonprism/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210323 2014-04-14 09:05:45Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Maintainer: André Silva _pkgname=grilo-plugins pkgname=grilo-plugins-nonprism diff --git a/nonprism/gthumb-nonprism/PKGBUILD b/nonprism/gthumb-nonprism/PKGBUILD index a779e07d4..759e14f2b 100644 --- a/nonprism/gthumb-nonprism/PKGBUILD +++ b/nonprism/gthumb-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 209693 2014-04-01 12:03:03Z jgc $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot -# Contributor: Tobias Kieslich -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Jan Alexander Steffens (heftig) +# Contributor (Arch): Jan de Groot +# Contributor (Arch): Tobias Kieslich +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=gthumb pkgname=gthumb-nonprism diff --git a/nonprism/jitsi-nonprism/PKGBUILD b/nonprism/jitsi-nonprism/PKGBUILD index e7005e94d..d8eaa082d 100644 --- a/nonprism/jitsi-nonprism/PKGBUILD +++ b/nonprism/jitsi-nonprism/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Xavier Devlamynck +# Maintainer (Arch): Xavier Devlamynck # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=jitsi pkgname=jitsi-nonprism diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index 2cb6c694e..183a5e371 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 6dcec71fe..b3f8490bf 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $ -# Maintainer: Andrea Scarpino -# Contributor: Pierre Schmitz -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz +# Maintainer: André Silva _pkgname=kdepim-runtime pkgname=kdepim-runtime-nonprism diff --git a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD index 5089a9ffd..63d83cb59 100644 --- a/nonprism/kipi-plugins-libre-nonprism/PKGBUILD +++ b/nonprism/kipi-plugins-libre-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $ -# Maintainer: Ronald van Haren -# Contributor: Andrea Scarpino -# Contributor: Tobias Powalowski -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Ronald van Haren +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Tobias Powalowski +# Maintainer: André Silva +# Contributor: Márcio Silva pkgbase=digikam _pkgname=kipi-plugins diff --git a/nonprism/openshot-libre-nonprism/PKGBUILD b/nonprism/openshot-libre-nonprism/PKGBUILD index df4b3a577..396e469e6 100644 --- a/nonprism/openshot-libre-nonprism/PKGBUILD +++ b/nonprism/openshot-libre-nonprism/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $ -# Maintainer: Sergej Pupykin -# Contributor: Asa Marco -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Asa Marco +# Maintainer: André Silva _pkgname=openshot pkgname=openshot-libre-nonprism diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD index 848606fd0..d7593d2a0 100644 --- a/nonprism/pidgin-nonprism/PKGBUILD +++ b/nonprism/pidgin-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 205034 2014-02-03 14:10:06Z foutrelis $ -# Maintainer: Evangelos Foutras -# Contributor: Ionut Biru -# Contributor: Andrea Scarpino -# Contributor: Alexander Fehr -# Contributor: Lucien Immink +# Maintainer (Arch): Evangelos Foutras +# Contributor (Arch): Ionut Biru +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): Lucien Immink _pkgname=pidgin pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism') diff --git a/nonprism/shotwell-nonprism/PKGBUILD b/nonprism/shotwell-nonprism/PKGBUILD index 4facefc61..6e6500940 100644 --- a/nonprism/shotwell-nonprism/PKGBUILD +++ b/nonprism/shotwell-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 107774 2014-03-19 12:02:19Z spupykin $ -# Maintainer: Sergej Pupykin -# Maintainer : Ionut Biru -# Contributor: Joeny Ang -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Arch): Sergej Pupykin +# Maintainer (Arch): Ionut Biru +# Contributor (Arch): Joeny Ang +# Maintainer: André Silva +# Contributor: Márcio Silva _pkgname=shotwell pkgname=shotwell-nonprism diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD index b03de9845..98282e094 100644 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ b/nonprism/sylpheed-nonprism/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 108818 2014-04-04 16:07:28Z speps $ -# Maintainer: speps -# Contributor: Alexander Fehr -# Contributor: dorphell -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Aditya Som " +# Maintainer (Arch): speps +# Contributor (Arch): Alexander Fehr +# Contributor (Arch): dorphell +# Maintainer: André Silva +# Contributor: Aditya Som " _pkgname=sylpheed pkgname=sylpheed-nonprism diff --git a/pcr/acr/PKGBUILD b/pcr/acr/PKGBUILD index d1ba1744b..a786ab622 100644 --- a/pcr/acr/PKGBUILD +++ b/pcr/acr/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: stalker_exe +# Maintainer (Arch): stalker_exe pkgname=acr pkgver=0.8.6 pkgrel=1 diff --git a/pcr/ahcpd/PKGBUILD b/pcr/ahcpd/PKGBUILD index 52c917bbc..aefa8bda8 100644 --- a/pcr/ahcpd/PKGBUILD +++ b/pcr/ahcpd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Yann Lopez +# Maintainer (Arch): Yann Lopez pkgname=ahcpd pkgver=0.53 pkgrel=2 diff --git a/pcr/android-udev/PKGBUILD b/pcr/android-udev/PKGBUILD index 10fe60934..000953e1f 100644 --- a/pcr/android-udev/PKGBUILD +++ b/pcr/android-udev/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker # Maintainer (AUR): M0Rf30 -# Contributor: marlock +# Contributor (Arch): marlock pkgname=android-udev pkgver=20130911 diff --git a/pcr/anyremote/PKGBUILD b/pcr/anyremote/PKGBUILD index 96e030245..dd8aff92f 100644 --- a/pcr/anyremote/PKGBUILD +++ b/pcr/anyremote/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Andrea Fagiani -# Contributor: hb -# Contributor: Lisa Denia +# Contributor (Arch): Andrea Fagiani +# Contributor (Arch): hb +# Contributor (Arch): Lisa Denia # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=anyremote diff --git a/pcr/aqsis/PKGBUILD b/pcr/aqsis/PKGBUILD index f7de71f6f..5e6566864 100644 --- a/pcr/aqsis/PKGBUILD +++ b/pcr/aqsis/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Lukas Jirkovsky -# Former contributor: Gino Pezzin -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Lukas Jirkovsky +# Former contributor (Arch): Gino Pezzin +# Maintainer: Márcio Silva pkgname=aqsis pkgver=1.8.2 diff --git a/pcr/aseprite/PKGBUILD b/pcr/aseprite/PKGBUILD index bf0052363..27648972a 100644 --- a/pcr/aseprite/PKGBUILD +++ b/pcr/aseprite/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Benoit Favre -# Contributor: Alexander Rødseth +# Maintainer (Arch): Benoit Favre +# Contributor (Arch): Alexander Rødseth pkgname=aseprite pkgver=0.9.5 diff --git a/pcr/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD index 01bc1ae6e..e67519bd5 100644 --- a/pcr/asterisk/PKGBUILD +++ b/pcr/asterisk/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer : Xavier Devlamynck -# Contributor: Alessio Biancalana -# Contributor: Maik Broemme +# Maintainer (Arch): Xavier Devlamynck +# Contributor (Arch): Alessio Biancalana +# Contributor (Arch): Maik Broemme pkgname=asterisk pkgver=11.5.0 diff --git a/pcr/aurvote/PKGBUILD b/pcr/aurvote/PKGBUILD index 4dcf8d3d2..712e5d2c4 100644 --- a/pcr/aurvote/PKGBUILD +++ b/pcr/aurvote/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: tuxce +# Maintainer (Arch): tuxce # Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=aurvote diff --git a/pcr/auto-complete/PKGBUILD b/pcr/auto-complete/PKGBUILD index afa9d8691..884956f45 100644 --- a/pcr/auto-complete/PKGBUILD +++ b/pcr/auto-complete/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: abf +# Contributor (Arch): abf # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=auto-complete diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index 20d442fd6..3b0dd994a 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (AUR): Yann Lopez -# Maintainer (Parabola): fauno +# Maintainer: fauno pkgname=babeld pkgver=1.4.1 pkgrel=1 diff --git a/pcr/bambus/PKGBUILD b/pcr/bambus/PKGBUILD index d76ba2dc2..ca0907bf7 100644 --- a/pcr/bambus/PKGBUILD +++ b/pcr/bambus/PKGBUILD @@ -1,6 +1,6 @@ # Bambus -# Contributor: ying -# Contributor: ying +# Contributor (Arch): ying +# Contributor (Arch): ying # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=bambus diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD index 681d3da7e..dde900e7d 100644 --- a/pcr/bamf2/PKGBUILD +++ b/pcr/bamf2/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Ivan de Jesús Pompa García -# Contributors: niQo ??? +# Maintainer (Arch): Ivan de Jesús Pompa García +# Contributors (Arch): niQo ??? pkgname=bamf2 _dname=bamf diff --git a/pcr/barnyard2/PKGBUILD b/pcr/barnyard2/PKGBUILD index 7b52c952c..47b16d3ab 100644 --- a/pcr/barnyard2/PKGBUILD +++ b/pcr/barnyard2/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Commiebstrd +# Contributor (Arch): Commiebstrd # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=barnyard2 diff --git a/pcr/bashmount/PKGBUILD b/pcr/bashmount/PKGBUILD index e468ab79f..78f409d0c 100644 --- a/pcr/bashmount/PKGBUILD +++ b/pcr/bashmount/PKGBUILD @@ -1,4 +1,4 @@ -# Contributer: Jamie Nguyen +# Contributer (Arch): Jamie Nguyen # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=bashmount diff --git a/pcr/batctl/PKGBUILD b/pcr/batctl/PKGBUILD index 521537a50..d0ea3b884 100644 --- a/pcr/batctl/PKGBUILD +++ b/pcr/batctl/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Nathan Owe -# Maintainer: Thomas Weißschuh +# Contributor (Arch): Nathan Owe +# Maintainer (Arch): Thomas Weißschuh pkgname=batctl pkgver=2012.3.0 pkgrel=2 diff --git a/pcr/bibletime/PKGBUILD b/pcr/bibletime/PKGBUILD index 3a2941623..be612c6eb 100644 --- a/pcr/bibletime/PKGBUILD +++ b/pcr/bibletime/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: SanskritFritz (gmail) -# Contributor: Alexander Rødseth -# Contributor: Tobias T. +# Maintainer (Arch): SanskritFritz (gmail) +# Contributor (Arch): Alexander Rødseth +# Contributor (Arch): Tobias T. pkgname=bibletime pkgver=2.9.2 diff --git a/pcr/bison++/PKGBUILD b/pcr/bison++/PKGBUILD index 947c41df4..0aa6157d3 100644 --- a/pcr/bison++/PKGBUILD +++ b/pcr/bison++/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Antonio Garcia-Dominguez +# Contributor (Arch): Antonio Garcia-Dominguez # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=bison++ diff --git a/pcr/bup/PKGBUILD b/pcr/bup/PKGBUILD index d45d60961..630a55490 100644 --- a/pcr/bup/PKGBUILD +++ b/pcr/bup/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Bram Schoenmakers -# Contributor: henning mueller +# Contributor (Arch): Bram Schoenmakers +# Contributor (Arch): henning mueller # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières # If you'd like to have documentation, please set the variable below to 1. diff --git a/pcr/cambozola/PKGBUILD b/pcr/cambozola/PKGBUILD index 27664f181..972a175c8 100644 --- a/pcr/cambozola/PKGBUILD +++ b/pcr/cambozola/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Ernie Brodeur +# Maintainer (Arch): Ernie Brodeur pkgname=cambozola pkgver=0.92 pkgrel=1 diff --git a/pcr/cegui-0.5/PKGBUILD b/pcr/cegui-0.5/PKGBUILD index 60c3427cc..12c8eb0f6 100644 --- a/pcr/cegui-0.5/PKGBUILD +++ b/pcr/cegui-0.5/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jakub Luzny +# Contributor (Arch): Jakub Luzny # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=cegui-0.5 diff --git a/pcr/cegui-0.6/PKGBUILD b/pcr/cegui-0.6/PKGBUILD index fb28c2134..50cb104fc 100644 --- a/pcr/cegui-0.6/PKGBUILD +++ b/pcr/cegui-0.6/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Lucio zara +# Contributor (Arch): Lucio zara # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=cegui-0.6 diff --git a/pcr/cgdb/PKGBUILD b/pcr/cgdb/PKGBUILD index e623d5a96..1ecef9faa 100644 --- a/pcr/cgdb/PKGBUILD +++ b/pcr/cgdb/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Javier ‘Phrodo_00’ Aravena +# Contributor (Arch): Javier ‘Phrodo_00’ Aravena # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=cgdb diff --git a/pcr/cherokee/PKGBUILD b/pcr/cherokee/PKGBUILD index 1d3b3d941..4ffe40afa 100644 --- a/pcr/cherokee/PKGBUILD +++ b/pcr/cherokee/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 63849 2012-02-06 06:17:28Z foutrelis $ -# Maintainer: Fernando Jiménez Solano -# Contributor: Evangelos Foutras -# Contributor: Link Dupont -# Contributor: Pierre Bourdin +# Maintainer (Arch): Fernando Jiménez Solano +# Contributor (Arch): Evangelos Foutras +# Contributor (Arch): Link Dupont +# Contributor (Arch): Pierre Bourdin pkgname=cherokee pkgver=1.2.103 diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD index 16586e732..44df24990 100644 --- a/pcr/chm2pdf/PKGBUILD +++ b/pcr/chm2pdf/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Rodrigo Coacci -# Contributor: fes0 +# Contributor (Arch): Rodrigo Coacci +# Contributor (Arch): fes0 # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières pkgname=chm2pdf diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD index db6c02b4f..9d7d9a000 100644 --- a/pcr/cinepaint-lts/PKGBUILD +++ b/pcr/cinepaint-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ -# Maintainer: tobias [tobias.archlinux.org] -# Contributor: tobias [tobias.justdreams.de] -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): tobias [tobias.archlinux.org] +# Contributor (Arch): tobias [tobias.justdreams.de] +# Maintainer: Márcio Silva pkgname=cinepaint-lts pkgver=1.0 diff --git a/pcr/cjdns-git/PKGBUILD b/pcr/cjdns-git/PKGBUILD index 2e9646006..260326501 100644 --- a/pcr/cjdns-git/PKGBUILD +++ b/pcr/cjdns-git/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Prurigro -# Contributor: Prurigro -# Contributor: Werecat -# Contributor: Xyne +# Maintainer (Arch): Prurigro +# Contributor (Arch): Prurigro +# Contributor (Arch): Werecat +# Contributor (Arch): Xyne _pkgname=cjdns pkgname=${_pkgname}-git diff --git a/pcr/cl-ppcre/PKGBUILD b/pcr/cl-ppcre/PKGBUILD index b136c4ac9..39aa8dad6 100644 --- a/pcr/cl-ppcre/PKGBUILD +++ b/pcr/cl-ppcre/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: mrshpot -# Contributor: veox -# Contributor: joyfulgirl -# Contributor: Jonathan Friedman +# Maintainer (Arch): mrshpot +# Contributor (Arch): veox +# Contributor (Arch): joyfulgirl +# Contributor (Arch): Jonathan Friedman # Maintainer : Parabola GNU / Linux-libre pkgname=cl-ppcre diff --git a/pcr/clx-git/PKGBUILD b/pcr/clx-git/PKGBUILD index 6e2a3369b..8abc21c0e 100644 --- a/pcr/clx-git/PKGBUILD +++ b/pcr/clx-git/PKGBUILD @@ -1,4 +1,4 @@ -#Contributor: Akshay Srinivasan +#Contributor (Arch): Akshay Srinivasan pkgname=clx-git _clname=clx pkgver=20120421 diff --git a/pcr/coin/PKGBUILD b/pcr/coin/PKGBUILD index c584949c9..8c1b88fe5 100644 --- a/pcr/coin/PKGBUILD +++ b/pcr/coin/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Christian Hesse -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: mickele -# Contributor: marcus fritzsch +# Contributor (Arch): Christian Hesse +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): mickele +# Contributor (Arch): marcus fritzsch # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrières pkgname=coin diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index e663ccc37..60085df0b 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname=collada-dom pkgver=2.4.0 diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index 60aaa4fd5..3cd03daa3 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Aurelien Desbrieres -# Contributor: Diogo Leal +# Contributor (Arch): Diogo Leal # Contributor: Luke Shumaker -# Contributor: Matthias Maennich +# Contributor (Arch): Matthias Maennich pkgname=command-not-found pkgver=0.4.5 diff --git a/pcr/conky-control/PKGBUILD b/pcr/conky-control/PKGBUILD index c607ae86b..bb0d8301b 100644 --- a/pcr/conky-control/PKGBUILD +++ b/pcr/conky-control/PKGBUILD @@ -1,4 +1,4 @@ -# Contributer: giacomogiorgianni@gmail.com +# Contributer (Arch): giacomogiorgianni@gmail.com # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=conky-control diff --git a/pcr/conky-lua/PKGBUILD b/pcr/conky-lua/PKGBUILD index 6d36e9c29..fced6f7ed 100644 --- a/pcr/conky-lua/PKGBUILD +++ b/pcr/conky-lua/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: Renato Garcia -# Contributor: Giovanni Scafora -# Contributor: James Rayner -# Contributor: Partha Chowdhury -# Contributor: Gaetan Bisson +# Contributor (Arch): Renato Garcia +# Contributor (Arch): Giovanni Scafora +# Contributor (Arch): James Rayner +# Contributor (Arch): Partha Chowdhury +# Contributor (Arch): Gaetan Bisson # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=conky-lua diff --git a/pcr/cpuminer/PKGBUILD b/pcr/cpuminer/PKGBUILD index be6cd1678..ce42aa339 100644 --- a/pcr/cpuminer/PKGBUILD +++ b/pcr/cpuminer/PKGBUILD @@ -1,4 +1,4 @@ -## Maintainer : gee +## Maintainer (Arch): gee name=cpuminer pkgname=$name diff --git a/pcr/culmus-latex/PKGBUILD b/pcr/culmus-latex/PKGBUILD index 8562f2fb5..5717d9cc7 100644 --- a/pcr/culmus-latex/PKGBUILD +++ b/pcr/culmus-latex/PKGBUILD @@ -1,5 +1,5 @@ #Contributor (Arch): Dmitry Batenkov -# Maintainer (Parabola): Alon Ivtsan +# Maintainer: Alon Ivtsan # taken from https://aur.archlinux.org/packages/culmus-latex/ pkgname=culmus-latex diff --git a/pcr/culmus/PKGBUILD b/pcr/culmus/PKGBUILD index 3d1a5f567..8f086231a 100644 --- a/pcr/culmus/PKGBUILD +++ b/pcr/culmus/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer (Arch): Ivan Puntiy # Contributor (Arch): -# Maintainer (Parabola): Alon Ivtsan +# Maintainer: Alon Ivtsan # taken from https://aur.archlinux.org/packages/culmus/ pkgname=culmus diff --git a/pcr/cw/PKGBUILD b/pcr/cw/PKGBUILD index fb26acb4a..82573f68d 100644 --- a/pcr/cw/PKGBUILD +++ b/pcr/cw/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: William Díaz +# Contributor (Arch): William Díaz # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=cw diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD index 2cb94125c..dd16901f0 100644 --- a/pcr/czmq/PKGBUILD +++ b/pcr/czmq/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Brian Knox -# Maintainer: Brian Knox +# Contributor (Arch): Brian Knox +# Maintainer (Arch): Brian Knox pkgname=czmq pkgver=2.0.2 pkgrel=1 diff --git a/pcr/d0_blind_id-git/PKGBUILD b/pcr/d0_blind_id-git/PKGBUILD index bfda13205..99a3044e7 100644 --- a/pcr/d0_blind_id-git/PKGBUILD +++ b/pcr/d0_blind_id-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: MrBougo +# Maintainer (Arch): MrBougo pkgname=d0_blind_id-git pkgver=20120716 pkgrel=1 diff --git a/pcr/darcsver/PKGBUILD b/pcr/darcsver/PKGBUILD index e93250680..cd6ad45d4 100644 --- a/pcr/darcsver/PKGBUILD +++ b/pcr/darcsver/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Andreas B. Wagner -# Maintainer: Nicolas Pouillard -# Contributor: Peter Simons +# Maintainer (Arch): Andreas B. Wagner +# Maintainer (Arch): Nicolas Pouillard +# Contributor (Arch): Peter Simons pkgname=darcsver pkgver=1.7.4 pkgrel=2 diff --git a/pcr/debhelper/PKGBUILD b/pcr/debhelper/PKGBUILD index 60ff8f267..9795a14ea 100644 --- a/pcr/debhelper/PKGBUILD +++ b/pcr/debhelper/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer (AUR): Antoine Lubineau # Contributor (AUR): Andrei "Garoth" Thorp -# Contributor (Parabola): Luke Shumaker +# Contributor: Luke Shumaker _debrepo=http://ftp.debian.org/debian/pool/main/ # Debian Sid debfile() { echo -n "$_debrepo"; echo -n "$@"|sed -r 's@(.).*@\1/&@'; } diff --git a/pcr/django-cms/PKGBUILD b/pcr/django-cms/PKGBUILD index 9a641b7fb..555c818d0 100644 --- a/pcr/django-cms/PKGBUILD +++ b/pcr/django-cms/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Baptiste Jonglez -# Contributor: Fabio Volpe -# Contributor: Apkawa +# Contributor (Arch): Baptiste Jonglez +# Contributor (Arch): Fabio Volpe +# Contributor (Arch): Apkawa # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires pkgname=django-cms diff --git a/pcr/django-extensions/PKGBUILD b/pcr/django-extensions/PKGBUILD index 535091cfc..a416d92b6 100644 --- a/pcr/django-extensions/PKGBUILD +++ b/pcr/django-extensions/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Alper Kanat -# Contributor: Schnouki +# Contributor (Arch): Alper Kanat +# Contributor (Arch): Schnouki # Maintainer : Parabola GNU / Linux-libre pkgname=django-extensions diff --git a/pcr/django-social-auth/PKGBUILD b/pcr/django-social-auth/PKGBUILD index 379a066a2..9e6fee298 100644 --- a/pcr/django-social-auth/PKGBUILD +++ b/pcr/django-social-auth/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Benjamin A. Shelton +# Maintainer (Arch): Benjamin A. Shelton # Source: https://github.com/zancarius/archlinux-pkgbuilds # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/django-tagging/PKGBUILD b/pcr/django-tagging/PKGBUILD index 83f808280..da23b0495 100644 --- a/pcr/django-tagging/PKGBUILD +++ b/pcr/django-tagging/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Ryan Coyner -# Contributor: James Pearson +# Contributor (Arch): Ryan Coyner +# Contributor (Arch): James Pearson # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires pkgname=django-tagging diff --git a/pcr/doxymacs/PKGBUILD b/pcr/doxymacs/PKGBUILD index 09a46a0ae..cc4dd39cb 100644 --- a/pcr/doxymacs/PKGBUILD +++ b/pcr/doxymacs/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Limao Luo +# Contributor (Arch): Limao Luo # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=doxymacs diff --git a/pcr/dratmenu/PKGBUILD b/pcr/dratmenu/PKGBUILD index 8d6a2b357..d1bace462 100644 --- a/pcr/dratmenu/PKGBUILD +++ b/pcr/dratmenu/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: ivoarch +# Contributor (Arch): ivoarch # Maintainer : Parabola Aurélien DESBRIÈRES pkgname=dratmenu diff --git a/pcr/dropbear/PKGBUILD b/pcr/dropbear/PKGBUILD index 1e50534a3..9f7a719da 100644 --- a/pcr/dropbear/PKGBUILD +++ b/pcr/dropbear/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Jaroslav Lichtblau -# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> -# Contributor: Jeremy Cowgar +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> +# Contributor (Arch): Jeremy Cowgar pkgname=dropbear pkgver=0.53.1 diff --git a/pcr/dsh/PKGBUILD b/pcr/dsh/PKGBUILD index 605598100..7430f3bbb 100644 --- a/pcr/dsh/PKGBUILD +++ b/pcr/dsh/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: SkiltZ +# Contributor (Arch): SkiltZ # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=dsh diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD index 70d27ec71..22c6cb883 100644 --- a/pcr/econnman/PKGBUILD +++ b/pcr/econnman/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Doug Newgard +# Maintainer (Arch): Doug Newgard pkgname=econnman pkgver=1.1 diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD index 240b55f8a..8709d1edf 100644 --- a/pcr/eigen3/PKGBUILD +++ b/pcr/eigen3/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Chirantan Ekbote -# Contributor: Kringel +# Contributor (Arch): Chirantan Ekbote +# Contributor (Arch): Kringel # This PKGBUILD is a modified version of eigen 2.x in extra/eigen # Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières diff --git a/pcr/emacs-bzr/PKGBUILD b/pcr/emacs-bzr/PKGBUILD index 7383e3490..0497af51d 100644 --- a/pcr/emacs-bzr/PKGBUILD +++ b/pcr/emacs-bzr/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Neil Santos +# Contributor (Arch): Neil Santos # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres # Compile against Gtk+ 2.x, instead of the default 3.x diff --git a/pcr/emacs-color-theme/PKGBUILD b/pcr/emacs-color-theme/PKGBUILD index 53ad1bf24..6e61a3aa7 100644 --- a/pcr/emacs-color-theme/PKGBUILD +++ b/pcr/emacs-color-theme/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 59903 2011-12-02 11:18:13Z andrea $ -# Contributor: Stefan Husmann -# Contributor: Cesar Romero +# Contributor (Arch): Stefan Husmann +# Contributor (Arch): Cesar Romero # Maintainer : Parabola GNU / Linux-libre pkgname=emacs-color-theme diff --git a/pcr/emacs-elib/PKGBUILD b/pcr/emacs-elib/PKGBUILD index 22946859e..f424b63a4 100644 --- a/pcr/emacs-elib/PKGBUILD +++ b/pcr/emacs-elib/PKGBUILD @@ -1,5 +1,5 @@ # PKGBUILD for Emacs Lisp Library (elib) -# Contributor: J. Bromley +# Contributor (Arch): J. Bromley # $Id: PKGBUILD,v e6d455730f95 2009/12/03 05:38:28 jbromley $ # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/emacs-jabber/PKGBUILD b/pcr/emacs-jabber/PKGBUILD index 0b2170261..331029cdf 100644 --- a/pcr/emacs-jabber/PKGBUILD +++ b/pcr/emacs-jabber/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Stefan Husmann +# Contributor (Arch): Stefan Husmann # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=emacs-jabber diff --git a/pcr/emacs-js2-mode/PKGBUILD b/pcr/emacs-js2-mode/PKGBUILD index 7a73d3f40..49a4cbc04 100644 --- a/pcr/emacs-js2-mode/PKGBUILD +++ b/pcr/emacs-js2-mode/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Hauke Wesselmann +# Contributor (Arch): Hauke Wesselmann # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=emacs-js2-mode diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD index 1c87aaef4..1e3be71a4 100644 --- a/pcr/emacs-lucid/PKGBUILD +++ b/pcr/emacs-lucid/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker # Maintainer (Arch): Juergen Hoetzel -# Contributor: Renchi Raju +# Contributor (Arch): Renchi Raju _pkgname=emacs pkgname=emacs-lucid diff --git a/pcr/emacs-magit-git/PKGBUILD b/pcr/emacs-magit-git/PKGBUILD index 734b13072..7957a7549 100644 --- a/pcr/emacs-magit-git/PKGBUILD +++ b/pcr/emacs-magit-git/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Stefan Husmann -# Contributor: Peter Simons -# Contributor: Just Lest -# Contributor: Daniel White +# Contributor (Arch): Stefan Husmann +# Contributor (Arch): Peter Simons +# Contributor (Arch): Just Lest +# Contributor (Arch): Daniel White # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=emacs-magit-git diff --git a/pcr/emacs-newlisp/PKGBUILD b/pcr/emacs-newlisp/PKGBUILD index 25dcbc219..5f528640d 100644 --- a/pcr/emacs-newlisp/PKGBUILD +++ b/pcr/emacs-newlisp/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jan Krvek -# Contributor: Stefan Husmann +# Contributor (Arch): Jan Krvek +# Contributor (Arch): Stefan Husmann # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES pkgname=emacs-newlisp diff --git a/pcr/emacs-org-mode-ravel-git/PKGBUILD b/pcr/emacs-org-mode-ravel-git/PKGBUILD index 66baa08b5..1801ad724 100644 --- a/pcr/emacs-org-mode-ravel-git/PKGBUILD +++ b/pcr/emacs-org-mode-ravel-git/PKGBUILD @@ -1,5 +1,5 @@ # contributor: zhuqin -# Maintainer: Stefan Husmann +# Maintainer (Arch): Stefan Husmann # Maintainer : Parabola GNU / Linux-libre pkgname=emacs-org-mode-ravel-git diff --git a/pcr/emacs-org-mode/PKGBUILD b/pcr/emacs-org-mode/PKGBUILD index 4b36a3e3b..dbff05b6b 100644 --- a/pcr/emacs-org-mode/PKGBUILD +++ b/pcr/emacs-org-mode/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jiyunatori -# Contributor: mdev +# Contributor (Arch): Jiyunatori +# Contributor (Arch): mdev # adopted by domanov # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/emacs-tuareg-mode/PKGBUILD b/pcr/emacs-tuareg-mode/PKGBUILD index eba2834e0..214a801ca 100644 --- a/pcr/emacs-tuareg-mode/PKGBUILD +++ b/pcr/emacs-tuareg-mode/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Limao Luo +# Contributor (Arch): Limao Luo # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=emacs-tuareg-mode diff --git a/pcr/emhacks/PKGBUILD b/pcr/emhacks/PKGBUILD index 66f0045e5..30fbc533c 100644 --- a/pcr/emhacks/PKGBUILD +++ b/pcr/emhacks/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Junmin Huang -# Contributor: Stefan Husmann +# Contributor (Arch): Junmin Huang +# Contributor (Arch): Stefan Husmann # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=emhacks diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD index f5ba66574..796b4125d 100644 --- a/pcr/etckeeper/PKGBUILD +++ b/pcr/etckeeper/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker # Maintainer (AUR): Buce -# Contributor: Danie Roux -# Contributor: Diogo Leal +# Contributor (Arch): Danie Roux +# Contributor (Arch): Diogo Leal pkgname=etckeeper pkgver=1.11 diff --git a/pcr/eterm/PKGBUILD b/pcr/eterm/PKGBUILD index 00030e80a..3e2a2f5d7 100644 --- a/pcr/eterm/PKGBUILD +++ b/pcr/eterm/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Andrea Scarpino -# Contributor: Adam 'battlemidget' Stokes -# Contributor: Daniel J Griffiths -# Contributor: Brad Fanella +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Adam 'battlemidget' Stokes +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Brad Fanella # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=eterm diff --git a/pcr/evolution-mapi/PKGBUILD b/pcr/evolution-mapi/PKGBUILD index 851bb3c4d..d63d65348 100644 --- a/pcr/evolution-mapi/PKGBUILD +++ b/pcr/evolution-mapi/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Heenry78 -# Contributor: ngoonee -# Contributor: Marco A Rojas +# Maintainer (Arch): Heenry78 +# Contributor (Arch): ngoonee +# Contributor (Arch): Marco A Rojas pkgname=evolution-mapi pkgver=3.6.2 _gnomever=3.6 diff --git a/pcr/expac-relative/PKGBUILD b/pcr/expac-relative/PKGBUILD index 42adc4c4c..b7a1dcf95 100644 --- a/pcr/expac-relative/PKGBUILD +++ b/pcr/expac-relative/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 87501 2013-04-02 00:06:04Z dreisner $ -# Maintainer: Dave Reisner -# Maintainer (Parabola): Esteban Carnevale -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Dave Reisner +# Maintainer: Esteban Carnevale +# Maintainer: André Silva _pkgname=expac pkgname=expac-relative diff --git a/pcr/facter/PKGBUILD b/pcr/facter/PKGBUILD index 956569001..f7ea64324 100644 --- a/pcr/facter/PKGBUILD +++ b/pcr/facter/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Greg Sutcliffe -# Contributor: Hyacinthe Cartiaux -# Contributor: Thomas S Hatch -# Contributor: Dave Simons +# Contributor (Arch): Greg Sutcliffe +# Contributor (Arch): Hyacinthe Cartiaux +# Contributor (Arch): Thomas S Hatch +# Contributor (Arch): Dave Simons # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=facter diff --git a/pcr/font-manager/PKGBUILD b/pcr/font-manager/PKGBUILD index 7224df504..76c731ef2 100644 --- a/pcr/font-manager/PKGBUILD +++ b/pcr/font-manager/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: Joeny Ang -# Contributor: Guan 'kuno' Qing -# Contributor: Guten Ye -# Contributor: i_magnific0 -# Maintainer (Parabola): Esteban Carnevale +# Contributor (Arch): Joeny Ang +# Contributor (Arch): Guan 'kuno' Qing +# Contributor (Arch): Guten Ye +# Contributor (Arch): i_magnific0 +# Maintainer: Esteban Carnevale pkgname=font-manager pkgver=0.5.7 diff --git a/pcr/fpdns/PKGBUILD b/pcr/fpdns/PKGBUILD index b4cff364a..b5791bbb1 100644 --- a/pcr/fpdns/PKGBUILD +++ b/pcr/fpdns/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Ermak +# Contributor (Arch): Ermak # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires pkgname=fpdns diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD index b67d776ac..c2fd232ec 100644 --- a/pcr/frame/PKGBUILD +++ b/pcr/frame/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Nicolas Quiénot < niQo at aur > +# Contributor (Arch): Nicolas Quiénot < niQo at aur > pkgname=frame pkgver=2.5.0 diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD index ff321ea02..cc1159917 100644 --- a/pcr/freeipmi/PKGBUILD +++ b/pcr/freeipmi/PKGBUILD @@ -1,6 +1,6 @@ # http://github.com/fukawi2/aur-packages -# Contributor: Nathan Owe -# Contributor: Phillip Smith +# Contributor (Arch): Nathan Owe +# Contributor (Arch): Phillip Smith # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières pkgname=freeipmi diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD index be9eb6759..a3b180ae7 100644 --- a/pcr/freetuxtv/PKGBUILD +++ b/pcr/freetuxtv/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Bernard Baeyens (berbae) +# Maintainer (Arch): Bernard Baeyens (berbae) pkgname=freetuxtv pkgver=0.6.5 pkgrel=3 diff --git a/pcr/fsniper/PKGBUILD b/pcr/fsniper/PKGBUILD index bf7e3a6c3..32ba4d2a7 100644 --- a/pcr/fsniper/PKGBUILD +++ b/pcr/fsniper/PKGBUILD @@ -1,5 +1,5 @@ -# Initial Contributor: andrewy -# Actual Contributor: Luca Cesari +# Initial Contributor (Arch): andrewy +# Actual Contributor (Arch): Luca Cesari arch=(i686 x86_64) pkgname=fsniper diff --git a/pcr/fwsnort/PKGBUILD b/pcr/fwsnort/PKGBUILD index 37a863822..0f470ca37 100644 --- a/pcr/fwsnort/PKGBUILD +++ b/pcr/fwsnort/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Colin Shea +# Contributor (Arch): Colin Shea # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=fwsnort diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD index b6ba8890c..282dc3d4d 100644 --- a/pcr/galera/PKGBUILD +++ b/pcr/galera/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Rustam Tsurik -# Contributor: Nico Suarez +# Maintainer (Arch): Rustam Tsurik +# Contributor (Arch): Nico Suarez pkgname=galera pkgver=25.3.2 diff --git a/pcr/gcc-gcj/PKGBUILD b/pcr/gcc-gcj/PKGBUILD index 7ed03b889..f50e496bf 100644 --- a/pcr/gcc-gcj/PKGBUILD +++ b/pcr/gcc-gcj/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Renan Manola -# Contributor: Stefan Husmann +# Contributor (Arch): Renan Manola +# Contributor (Arch): Stefan Husmann # Based on a modified version of the gcc PKGBUILD # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD index b4ad7137d..c61281e1d 100644 --- a/pcr/gcc-lts/PKGBUILD +++ b/pcr/gcc-lts/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ -# Maintainer: Allan McRae -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Allan McRae +# Maintainer: Márcio Silva # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD index 629cb9d12..655a60338 100644 --- a/pcr/geis/PKGBUILD +++ b/pcr/geis/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Nicolas Quiénot -# Contributor: Xiao-Long Chen +# Maintainer (Arch): Nicolas Quiénot +# Contributor (Arch): Xiao-Long Chen pkgname=geis pkgver=2.2.15 diff --git a/pcr/gens-gs/PKGBUILD b/pcr/gens-gs/PKGBUILD index 316c0af9c..74df2c68c 100644 --- a/pcr/gens-gs/PKGBUILD +++ b/pcr/gens-gs/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: trya +# Maintainer (Arch): trya pkgname=gens-gs pkgver=r7 diff --git a/pcr/gimp-pcr/PKGBUILD b/pcr/gimp-pcr/PKGBUILD index 75b54f27a..6b6ed80f1 100644 --- a/pcr/gimp-pcr/PKGBUILD +++ b/pcr/gimp-pcr/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 198811 2013-11-05 16:40:29Z bpiotrowski $ -# Maintainer: Daniel Isenmann +# Maintainer (Arch): Daniel Isenmann _pkgname=gimp pkgname=$_pkgname-pcr diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD index 013fc8642..2fcad0d50 100644 --- a/pcr/ginn/PKGBUILD +++ b/pcr/ginn/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Nicolas Quiénot +# Maintainer (Arch): Nicolas Quiénot pkgname=ginn pkgver=0.2.6 diff --git a/pcr/gitflow/PKGBUILD b/pcr/gitflow/PKGBUILD index b62042262..edd6d2a55 100644 --- a/pcr/gitflow/PKGBUILD +++ b/pcr/gitflow/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Techlive Zheng -# Contributor: Ernie Brodeur +# Maintainer (Arch): Techlive Zheng +# Contributor (Arch): Ernie Brodeur pkgname=gitflow pkgver=0.4.1 diff --git a/pcr/glance/PKGBUILD b/pcr/glance/PKGBUILD index a05e66686..3dd349e8b 100644 --- a/pcr/glance/PKGBUILD +++ b/pcr/glance/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Josh Chase +# Contributor (Arch): Josh Chase # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=glance diff --git a/pcr/gloobus-preview-bzr/PKGBUILD b/pcr/gloobus-preview-bzr/PKGBUILD index ae8a2fd87..42ecbb8f0 100644 --- a/pcr/gloobus-preview-bzr/PKGBUILD +++ b/pcr/gloobus-preview-bzr/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Alessio Sergi +# Contributor (Arch): Alessio Sergi # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=gloobus-preview-bzr diff --git a/pcr/gmqcc-git/PKGBUILD b/pcr/gmqcc-git/PKGBUILD index ab08b36ef..2e36a5a1e 100644 --- a/pcr/gmqcc-git/PKGBUILD +++ b/pcr/gmqcc-git/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: matthiaskrgr +# Contributor (Arch): matthiaskrgr pkgname=gmqcc-git pkgver=20130214 diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD index e8cec3c76..7e0e5afc4 100644 --- a/pcr/gmusicbrowser/PKGBUILD +++ b/pcr/gmusicbrowser/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Spike29 -# Contributor: jsteel -# Contributor: Corrado Primier +# Maintainer (Arch): Spike29 +# Contributor (Arch): jsteel +# Contributor (Arch): Corrado Primier pkgname=gmusicbrowser pkgver=1.1.10 diff --git a/pcr/gnash/PKGBUILD b/pcr/gnash/PKGBUILD index f932fa084..93265ce21 100644 --- a/pcr/gnash/PKGBUILD +++ b/pcr/gnash/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 107172 2014-03-14 00:14:28Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) +# Maintainer (Arch): Jan Alexander Steffens (heftig) pkgname=gnash pkgdesc="A GNU Flash movie player" diff --git a/pcr/gnome-rdp/PKGBUILD b/pcr/gnome-rdp/PKGBUILD index 67a96bb7f..c8f92134a 100644 --- a/pcr/gnome-rdp/PKGBUILD +++ b/pcr/gnome-rdp/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: György Balló -# Contributor: Hyperair -# Contributor: kumico -# Contributor: adamruss +# Contributor (Arch): György Balló +# Contributor (Arch): Hyperair +# Contributor (Arch): kumico +# Contributor (Arch): adamruss # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=gnome-rdp diff --git a/pcr/gnomeradio/PKGBUILD b/pcr/gnomeradio/PKGBUILD index 1fa76de08..1325bc4d2 100644 --- a/pcr/gnomeradio/PKGBUILD +++ b/pcr/gnomeradio/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: none +# Maintainer (Arch): none # Contributor: Luke Shumaker # Maintainer (AUR): tritonas00 -# Contributor: Ivan Rojas +# Contributor (Arch): Ivan Rojas # Because gnomeradio is written against ancient libraries, we must patch it to # compile and work on a modern system. Let's just grab the patch series that diff --git a/pcr/gnucash-docs/PKGBUILD b/pcr/gnucash-docs/PKGBUILD index 0895692f2..35cde0fbb 100644 --- a/pcr/gnucash-docs/PKGBUILD +++ b/pcr/gnucash-docs/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Mark Schneider +# Contributor (Arch): Mark Schneider # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=gnucash-docs diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index cc23c41d3..808c455cb 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: André Silva -# Contributor: SpepS -# Contributor: Ander +# Contributor (Arch): SpepS +# Contributor (Arch): Ander pkgname=gnuhealth pkgver=2.4.1 diff --git a/pcr/gnuit/PKGBUILD b/pcr/gnuit/PKGBUILD index 6c1983e32..fbbd71330 100644 --- a/pcr/gnuit/PKGBUILD +++ b/pcr/gnuit/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: James Reed -# Contributor: Leslie P. Polzer +# Contributor (Arch): James Reed +# Contributor (Arch): Leslie P. Polzer # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières pkgname=gnuit diff --git a/pcr/gnuplot-py/PKGBUILD b/pcr/gnuplot-py/PKGBUILD index 315c7b695..0e45af5ad 100644 --- a/pcr/gnuplot-py/PKGBUILD +++ b/pcr/gnuplot-py/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Michael Krauss -# Contributor : Baptiste Jonglez +# Contributor (Arch): Michael Krauss +# Contributor (Arch): Baptiste Jonglez # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=gnuplot-py diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD index c76d2214f..665c0f270 100644 --- a/pcr/grail/PKGBUILD +++ b/pcr/grail/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Nicolas Quiénot -# Contributor: Xiao-Long Chen -# Contributor: thn81 +# Maintainer (Arch): Nicolas Quiénot +# Contributor (Arch): Xiao-Long Chen +# Contributor (Arch): thn81 pkgname=grail pkgver=3.1.0 diff --git a/pcr/grass/PKGBUILD b/pcr/grass/PKGBUILD index aa32f8ca8..8043821a4 100644 --- a/pcr/grass/PKGBUILD +++ b/pcr/grass/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Emiliano Vavassori +# Maintainer (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor (Arch): Emiliano Vavassori pkgname=grass pkgver=6.4.2 diff --git a/pcr/gstreamer-hplugins/PKGBUILD b/pcr/gstreamer-hplugins/PKGBUILD index c8ec92cd2..bffa5b3a3 100644 --- a/pcr/gstreamer-hplugins/PKGBUILD +++ b/pcr/gstreamer-hplugins/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: SpepS +# Maintainer (Arch): SpepS pkgname=gstreamer-hplugins pkgver=0.1.2 diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD index 4c4c10b20..eaa99cc22 100644 --- a/pcr/gtk-theme-numix/PKGBUILD +++ b/pcr/gtk-theme-numix/PKGBUILD @@ -1,5 +1,5 @@ # Mantainer: Diego -# Contributor: Aleessio Sergi +# Contributor (Arch): Aleessio Sergi pkgname=gtk-theme-numix _theme=Numix diff --git a/pcr/gtkmm-utils/PKGBUILD b/pcr/gtkmm-utils/PKGBUILD index e3fdfd4a0..84ec12708 100644 --- a/pcr/gtkmm-utils/PKGBUILD +++ b/pcr/gtkmm-utils/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: TDY -# Contributor: Michele Vascellari +# Contributor (Arch): TDY +# Contributor (Arch): Michele Vascellari # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=gtkmm-utils diff --git a/pcr/gtkpacman/PKGBUILD b/pcr/gtkpacman/PKGBUILD index 0e66e33e5..bdf1657cd 100644 --- a/pcr/gtkpacman/PKGBUILD +++ b/pcr/gtkpacman/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Tetsumaki -# Contributor: Stefan Husmann -# Contributor: Stefano Esposito +# Contributor (Arch): Tetsumaki +# Contributor (Arch): Stefan Husmann +# Contributor (Arch): Stefano Esposito # Maintainer : Parabola GNU / Linux-libre pkgname=gtkpacman diff --git a/pcr/h264enc/PKGBUILD b/pcr/h264enc/PKGBUILD index 9f47c3640..151d05be0 100644 --- a/pcr/h264enc/PKGBUILD +++ b/pcr/h264enc/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: AlexanderR -# Contributor: Markus Heuser -# Contributor: Stefan Clarke +# Contributor (Arch): AlexanderR +# Contributor (Arch): Markus Heuser +# Contributor (Arch): Stefan Clarke # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=h264enc diff --git a/pcr/hiawatha/PKGBUILD b/pcr/hiawatha/PKGBUILD index 1ea4d6435..1288e09e2 100644 --- a/pcr/hiawatha/PKGBUILD +++ b/pcr/hiawatha/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Kurt Marasco -# Contributor: Pascal Ernster +# Maintainer (Arch): Kurt Marasco +# Contributor (Arch): Pascal Ernster pkgname=hiawatha pkgver=9.2 diff --git a/pcr/higan-gtk/PKGBUILD b/pcr/higan-gtk/PKGBUILD index 17d7469a6..a1c37fc37 100755 --- a/pcr/higan-gtk/PKGBUILD +++ b/pcr/higan-gtk/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Alucryd +# Maintainer (Arch): Alucryd pkgname=higan-gtk pkgver=092 diff --git a/pcr/higan-qt/PKGBUILD b/pcr/higan-qt/PKGBUILD index 42f7dd813..5b0bce679 100755 --- a/pcr/higan-qt/PKGBUILD +++ b/pcr/higan-qt/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Alucryd +# Maintainer (Arch): Alucryd pkgname=higan-qt pkgver=092 diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD index a6ad20868..d6e2938b9 100644 --- a/pcr/hiredis/PKGBUILD +++ b/pcr/hiredis/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: orphan +# Maintainer (Arch): orphan # Contributor: Nicolás Reynolds # Contributor: Luke Shumaker # Maintainer (AUR): Vladimir Tsanev diff --git a/pcr/httrack/PKGBUILD b/pcr/httrack/PKGBUILD index 4d40153ef..6e138c949 100644 --- a/pcr/httrack/PKGBUILD +++ b/pcr/httrack/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer : Marcos Heredia -# Contributor: Joris Steyn -# Contributor: speps -# Contributor: Roman Kyrylych -# Contributor: orelien +# Maintainer (Arch): Marcos Heredia +# Contributor (Arch): Joris Steyn +# Contributor (Arch): speps +# Contributor (Arch): Roman Kyrylych +# Contributor (Arch): orelien pkgname=httrack pkgver=3.47.27 diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD index 5c4ff0c3a..6a5018dae 100644 --- a/pcr/hunspell-pt-br/PKGBUILD +++ b/pcr/hunspell-pt-br/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Daniel Felipe Reis Apolinario -# Contributor: Bernardo Barros -# Contributor: Robson R S Peixoto -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Daniel Felipe Reis Apolinario +# Contributor (Arch): Bernardo Barros +# Contributor (Arch): Robson R S Peixoto +# Maintainer: André Silva pkgname=hunspell-pt-br pkgver=3.2 diff --git a/pcr/ibus-bogo/PKGBUILD b/pcr/ibus-bogo/PKGBUILD index 44652b204..915112d36 100644 --- a/pcr/ibus-bogo/PKGBUILD +++ b/pcr/ibus-bogo/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Nguyen Ha Duong -# Contributor: Ngo Trung -# Contributor: Dam Tien Long +# Contributor (Arch): Nguyen Ha Duong +# Contributor (Arch): Ngo Trung +# Contributor (Arch): Dam Tien Long # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname="ibus-bogo" diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD index 6834d64a6..cfd0d6e9d 100644 --- a/pcr/idjc/PKGBUILD +++ b/pcr/idjc/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: M0Rf30 -# Contributor: Tobias Luther -# Contributor: GraveDigger -# Contributor: Gaetan Bisson +# Maintainer (Arch): M0Rf30 +# Contributor (Arch): Tobias Luther +# Contributor (Arch): GraveDigger +# Contributor (Arch): Gaetan Bisson pkgname=idjc pkgver=0.8.9 diff --git a/pcr/ii/PKGBUILD b/pcr/ii/PKGBUILD index b17cc2d18..e471ca0ba 100644 --- a/pcr/ii/PKGBUILD +++ b/pcr/ii/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Evan Gates -# Contributor: Dag Odenhall -# Contributor: Chris Brannon -# Contributor: William Giokas <1007380@gmail.com> +# Contributor (Arch): Evan Gates +# Contributor (Arch): Dag Odenhall +# Contributor (Arch): Chris Brannon +# Contributor (Arch): William Giokas <1007380@gmail.com> pkgname=ii pkgver=1.7 pkgrel=2 diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD index 20bde347b..68cd9e607 100644 --- a/pcr/imagemagick-srv/PKGBUILD +++ b/pcr/imagemagick-srv/PKGBUILD @@ -1,6 +1,6 @@ # $Id$ -# Maintainer: Eric Bélanger -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Eric Bélanger +# Maintainer: Márcio Silva pkgbase=imagemagick pkgname=imagemagick-srv diff --git a/pcr/inadyn-opendns/PKGBUILD b/pcr/inadyn-opendns/PKGBUILD index 37c13d49a..dd361e00c 100644 --- a/pcr/inadyn-opendns/PKGBUILD +++ b/pcr/inadyn-opendns/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Bug -# Maintainer: Bug +# Contributor (Arch): Bug +# Maintainer (Arch): Bug pkgname=inadyn-opendns pkgver=1.99 pkgrel=4 diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD index 132ea7c59..bff60db1b 100644 --- a/pcr/ipmiutil/PKGBUILD +++ b/pcr/ipmiutil/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: goodmen -# Contributor: Gergely Imreh +# Contributor (Arch): goodmen +# Contributor (Arch): Gergely Imreh # Contributors: champus, madeye, Ranguvar and ninja_pt # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES diff --git a/pcr/ipycli-git/PKGBUILD b/pcr/ipycli-git/PKGBUILD index 86f6289d1..7ccf64839 100644 --- a/pcr/ipycli-git/PKGBUILD +++ b/pcr/ipycli-git/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Francois Boulogne +# Contributor (Arch): Francois Boulogne # Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières pkgname=ipycli-git diff --git a/pcr/irssi-xmpp/PKGBUILD b/pcr/irssi-xmpp/PKGBUILD index fa5d445c6..7af59df35 100644 --- a/pcr/irssi-xmpp/PKGBUILD +++ b/pcr/irssi-xmpp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Yogesh Powar +# Maintainer (Arch): Yogesh Powar pkgname=irssi-xmpp pkgver=0.52 pkgrel=1 diff --git a/pcr/jack-rack/PKGBUILD b/pcr/jack-rack/PKGBUILD index 26330bb2b..7363705b7 100644 --- a/pcr/jack-rack/PKGBUILD +++ b/pcr/jack-rack/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: DonVla -# Contributor: Patrick Leslie Polzer -# Contributor: Berkus -# Contributor: Daniele Paolella +# Maintainer (Arch): DonVla +# Contributor (Arch): Patrick Leslie Polzer +# Contributor (Arch): Berkus +# Contributor (Arch): Daniele Paolella pkgname=jack-rack pkgver=1.4.7 pkgrel=4 diff --git a/pcr/jdee/PKGBUILD b/pcr/jdee/PKGBUILD index 41cddfb08..6d2b3453c 100644 --- a/pcr/jdee/PKGBUILD +++ b/pcr/jdee/PKGBUILD @@ -1,5 +1,5 @@ # PKGBUILD for JDEE 2.4.0.1 -# Contributor: Brandon Ednes +# Contributor (Arch): Brandon Ednes # $Id$ # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index caa060d1c..0cf3d76f3 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Xavier Devlamynck +# Maintainer (Arch): Xavier Devlamynck # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne -# Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer: André Silva +# Contributor: Márcio Silva pkgname=jitsi pkgver=2.4.4997 diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD index 3e040a495..709d0bf96 100644 --- a/pcr/kamailio/PKGBUILD +++ b/pcr/kamailio/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Xavier Devlamynck +# Maintainer (Arch): Xavier Devlamynck pkgname=kamailio pkgver=4.0.1 diff --git a/pcr/knot/PKGBUILD b/pcr/knot/PKGBUILD index 4f785493a..546d3cdd8 100644 --- a/pcr/knot/PKGBUILD +++ b/pcr/knot/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Otto Sabart +# Contributor (Arch): Otto Sabart # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières pkgname=knot diff --git a/pcr/kompozer/PKGBUILD b/pcr/kompozer/PKGBUILD index a65fb3e3b..51eb968b2 100644 --- a/pcr/kompozer/PKGBUILD +++ b/pcr/kompozer/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Muflone -# Contributor: ingamedeo +# Maintainer (Arch): Muflone +# Contributor (Arch): ingamedeo # Maintainer : Parabola GNU / Linux-libre # thanks to tadzio, and techlive for the investigation diff --git a/pcr/lessc/PKGBUILD b/pcr/lessc/PKGBUILD index ec9f8cf90..6d5e33001 100644 --- a/pcr/lessc/PKGBUILD +++ b/pcr/lessc/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Massimiliano Torromeo +# Contributor (Arch): Massimiliano Torromeo # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=lessc diff --git a/pcr/libast/PKGBUILD b/pcr/libast/PKGBUILD index ede9ab2ce..d1e5adfff 100644 --- a/pcr/libast/PKGBUILD +++ b/pcr/libast/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 40906 2011-03-01 14:45:04Z andrea $ -# Contributor: Daniel J Griffiths -# Contributor: Adam 'battlemidget' Stokes +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Adam 'battlemidget' Stokes # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=libast diff --git a/pcr/libcacard/PKGBUILD b/pcr/libcacard/PKGBUILD index 0886b9847..c624d7f07 100644 --- a/pcr/libcacard/PKGBUILD +++ b/pcr/libcacard/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jameson Pugh +# Contributor (Arch): Jameson Pugh # Maintainer : Parabola / GNU / Linux-libre Aurelien Desbrieres pkgname=libcacard diff --git a/pcr/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD index 849a5c128..602045c75 100644 --- a/pcr/libcgroup/PKGBUILD +++ b/pcr/libcgroup/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Christian Hesse -# Contributor: Jan "heftig" Steffens +# Maintainer (Arch): Christian Hesse +# Contributor (Arch): Jan "heftig" Steffens pkgname=libcgroup pkgver=0.40rc1 diff --git a/pcr/libdrm-nvfx/PKGBUILD b/pcr/libdrm-nvfx/PKGBUILD index c8a08bea4..618771f45 100644 --- a/pcr/libdrm-nvfx/PKGBUILD +++ b/pcr/libdrm-nvfx/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $ -# Maintainer: Jan de Groot -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jan de Groot +# Maintainer: Márcio Silva _pkgname=libdrm pkgname=libdrm-nvfx diff --git a/pcr/libdshconfig/PKGBUILD b/pcr/libdshconfig/PKGBUILD index adf9d18b2..616378701 100644 --- a/pcr/libdshconfig/PKGBUILD +++ b/pcr/libdshconfig/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: SkiltZ +# Contributor (Arch): SkiltZ # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=libdshconfig diff --git a/pcr/libfreexl/PKGBUILD b/pcr/libfreexl/PKGBUILD index 69d94ce99..c5361c0e8 100644 --- a/pcr/libfreexl/PKGBUILD +++ b/pcr/libfreexl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Bruno Gola +# Maintainer (Arch): Bruno Gola pkgname=libfreexl pkgver=1.0.0e pkgrel=1 diff --git a/pcr/libibus/PKGBUILD b/pcr/libibus/PKGBUILD index 1a934121a..ff32e8cb0 100644 --- a/pcr/libibus/PKGBUILD +++ b/pcr/libibus/PKGBUILD @@ -1,9 +1,9 @@ # $Id$ -# Contributor: Felix Yan -# Contributor: Rainy -# Contributor: Lee.MaRS -# Contributor: Daniel J Griffiths -# Contributor: Brad Fanella +# Contributor (Arch): Felix Yan +# Contributor (Arch): Rainy +# Contributor (Arch): Lee.MaRS +# Contributor (Arch): Daniel J Griffiths +# Contributor (Arch): Brad Fanella # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires _pkgbase=ibus diff --git a/pcr/libnatpmp-from-social-repo/PKGBUILD b/pcr/libnatpmp-from-social-repo/PKGBUILD index ded1e6ca5..49a2d3193 100644 --- a/pcr/libnatpmp-from-social-repo/PKGBUILD +++ b/pcr/libnatpmp-from-social-repo/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Pierre Bourdon +# Maintainer (Arch): Pierre Bourdon pkgname=libnatpmp pkgver=20120821 diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD index f3306e87d..f427dfbfb 100644 --- a/pcr/libnatpmp/PKGBUILD +++ b/pcr/libnatpmp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Pierre Bourdon +# Maintainer (Arch): Pierre Bourdon # Maintainer: Parabola Gnu / Linux-libre Aurélien Desbrières pkgname=libnatpmp diff --git a/pcr/libpng12/PKGBUILD b/pcr/libpng12/PKGBUILD index df75ddeaa..5da1044de 100644 --- a/pcr/libpng12/PKGBUILD +++ b/pcr/libpng12/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 58551 2009-11-08 22:37:12Z eric $ -# Contributor: dorphell -# Contributor: Travis Willard -# Contributor: Douglas Soares de Andrade -# Maintainer: Jesse Jaara +# Contributor (Arch): dorphell +# Contributor (Arch): Travis Willard +# Contributor (Arch): Douglas Soares de Andrade +# Maintainer (Arch): Jesse Jaara pkgname=libpng12 _realname=libpng diff --git a/pcr/libpurple-minimal/PKGBUILD b/pcr/libpurple-minimal/PKGBUILD index 5526879d1..a4f8572f9 100644 --- a/pcr/libpurple-minimal/PKGBUILD +++ b/pcr/libpurple-minimal/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Magicking +# Maintainer (Arch): Magicking # Contributors: wzff BluePeppers n0nsense pkgname=libpurple-minimal pkgver=2.10.0 diff --git a/pcr/libqinfinity/PKGBUILD b/pcr/libqinfinity/PKGBUILD index fdd7ed0c4..2eaec2973 100644 --- a/pcr/libqinfinity/PKGBUILD +++ b/pcr/libqinfinity/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Antonio Rojas +# Contributor (Arch): Antonio Rojas # Maintainer: parabola Aurélien Desbrières pkgname=libqinfinity diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD index b03b2935e..c21a93c39 100644 --- a/pcr/libquvi-scripts-current/PKGBUILD +++ b/pcr/libquvi-scripts-current/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 196118 2013-10-07 11:53:00Z jgc $ -# Maintainer: Lukas Fleischer +# Maintainer (Arch): Lukas Fleischer pkgname=libquvi-scripts-current _pkgname=libquvi-scripts diff --git a/pcr/libspatialite/PKGBUILD b/pcr/libspatialite/PKGBUILD index 24c775fd8..59d7200e5 100644 --- a/pcr/libspatialite/PKGBUILD +++ b/pcr/libspatialite/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Brian Galey -# Contributor: Pietro Zambelli +# Maintainer (Arch): Brian Galey +# Contributor (Arch): Pietro Zambelli pkgname=libspatialite pkgver=4.0.0 pkgrel=1 diff --git a/pcr/libspnav/PKGBUILD b/pcr/libspnav/PKGBUILD index 01325c1cf..bb670ae99 100644 --- a/pcr/libspnav/PKGBUILD +++ b/pcr/libspnav/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jan Hambrecht -# Maintainer (Parabola): Márcio Silva +# Contributor (Arch): Jan Hambrecht +# Maintainer: Márcio Silva pkgname=libspnav pkgver=0.2.2 diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD index 17af64a96..114f125b1 100644 --- a/pcr/libsquish-svn/PKGBUILD +++ b/pcr/libsquish-svn/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Jorge Araya Navarro -# Contributor: F0ruD +# Contributor (Arch): F0ruD pkgname=libsquish-svn pkgver=48 pkgrel=5 diff --git a/pcr/libtool-lts/PKGBUILD b/pcr/libtool-lts/PKGBUILD index 66bcc547c..a92ec8d65 100644 --- a/pcr/libtool-lts/PKGBUILD +++ b/pcr/libtool-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 196866 2013-10-20 14:29:14Z allan $ -# Maintainer: Allan McRae -# Contributor: judd -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Allan McRae +# Contributor (Arch): judd +# Maintainer: Márcio Silva # NOTE: requires rebuilt with each new gcc version diff --git a/pcr/libtxc_dxtn/PKGBUILD b/pcr/libtxc_dxtn/PKGBUILD index d491ed6fb..eed474941 100644 --- a/pcr/libtxc_dxtn/PKGBUILD +++ b/pcr/libtxc_dxtn/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jan "heftig" Steffens +# Contributor (Arch): Jan "heftig" Steffens # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=libtxc_dxtn diff --git a/pcr/libwww-hg/PKGBUILD b/pcr/libwww-hg/PKGBUILD index 9fc91e231..567a3f57d 100644 --- a/pcr/libwww-hg/PKGBUILD +++ b/pcr/libwww-hg/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: Jorge Araya Navarro # Maintainer (Archlinux): Sergej Pupykin -# Contributor: Buharev Vasilij +# Contributor (Arch): Buharev Vasilij pkgname=libwww-hg pkgver=20130730 diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD index bab26aceb..50a467fc0 100644 --- a/pcr/lightspark/PKGBUILD +++ b/pcr/lightspark/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer : speps -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Jan "heftig" Steffens +# Maintainer (Arch): speps +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): Jan "heftig" Steffens pkgname=lightspark pkgver=0.7.2 diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD index bd2446fd4..4238f4219 100644 --- a/pcr/lilo/PKGBUILD +++ b/pcr/lilo/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Connor Behan -# Contributor: Eric Belanger -# Contributor: judd -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Connor Behan +# Contributor (Arch): Eric Belanger +# Contributor (Arch): judd +# Maintainer: André Silva pkgname=lilo pkgver=24.0 diff --git a/pcr/litecoin-qt/PKGBUILD b/pcr/litecoin-qt/PKGBUILD index 28aaf2c0c..96f121070 100644 --- a/pcr/litecoin-qt/PKGBUILD +++ b/pcr/litecoin-qt/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Loïc Guitaut +# Maintainer (Arch): Loïc Guitaut pkgname='litecoin-qt' pkgver=0.8.6.1 diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD index bfcb6bb53..4bee1d129 100644 --- a/pcr/log4c/PKGBUILD +++ b/pcr/log4c/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: rockerzz +# Contributor (Arch): rockerzz # pkgname=log4c pkgver=1.2.1 diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD index 413eb2ccf..77c408551 100644 --- a/pcr/lostfiles/PKGBUILD +++ b/pcr/lostfiles/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: graysky -# Maintainer (Parabola): Esteban Carnevale +# Contributor (Arch): graysky +# Maintainer: Esteban Carnevale pkgname=lostfiles pkgver=3.10 diff --git a/pcr/lprof/PKGBUILD b/pcr/lprof/PKGBUILD index b25927937..ec67639c5 100644 --- a/pcr/lprof/PKGBUILD +++ b/pcr/lprof/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Branko Vukelic -# Maintainer (Parabola): Márcio Silva -# Maintainer (Parabola): André Silva +# Contributor (Arch): Branko Vukelic +# Maintainer: Márcio Silva +# Maintainer: André Silva pkgname=lprof pkgver=1.11.4.1 diff --git a/pcr/lua-cyrussasl/PKGBUILD b/pcr/lua-cyrussasl/PKGBUILD index bc2fa8a32..987f51507 100644 --- a/pcr/lua-cyrussasl/PKGBUILD +++ b/pcr/lua-cyrussasl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Dwayne Bent +# Maintainer (Arch): Dwayne Bent pkgname=lua-cyrussasl pkgver=1.0.0 diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD index 04ffee934..05de8f661 100644 --- a/pcr/lua51-sql-mysql/PKGBUILD +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ -# Maintainer: Sergej Pupykin -# Contributor: Sébastien Luttringer -# Contributor: Anders Bergh +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Sébastien Luttringer +# Contributor (Arch): Anders Bergh pkgname=lua51-sql-mysql pkgdesc='MySQL module for Lua 5.1' diff --git a/pcr/luabind/PKGBUILD b/pcr/luabind/PKGBUILD index 25b556e64..2eb3f4a5a 100644 --- a/pcr/luabind/PKGBUILD +++ b/pcr/luabind/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Maintainer: Jakob Gruber -# Maintainer: Sven-Hendrik Haase -# Contributor: rayte -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jakob Gruber +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): rayte +# Maintainer: Márcio Silva pkgname=luabind pkgver=0.9.1 diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD index 995a12582..dd7733c6d 100644 --- a/pcr/maliit-framework/PKGBUILD +++ b/pcr/maliit-framework/PKGBUILD @@ -1,7 +1,6 @@ -# Contributor: Jon Nordby -# Maintainer: Jon Nordby -# Maintainer (Parabola): Javier Barcena -# Contributor (Parabola): André Silva +# Contributor (Arch): Jon Nordby +# Maintainer (Arch): Jon Nordby +# Contributor: André Silva pkgname=maliit-framework pkgver=0.99.0 diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD index cdab07003..3d29bd029 100644 --- a/pcr/maliit-plugins/PKGBUILD +++ b/pcr/maliit-plugins/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jon Nordby -# Maintainer: Jon Nordby +# Contributor (Arch): Jon Nordby +# Maintainer (Arch): Jon Nordby pkgname=maliit-plugins pkgver=0.99.0 diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD index 920137305..950d077fd 100644 --- a/pcr/mariadb-galera/PKGBUILD +++ b/pcr/mariadb-galera/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: Bartłomiej Piotrowski +# Maintainer (Arch): Bartłomiej Piotrowski pkgname=mariadb-galera pkgbase=mariadb-galera diff --git a/pcr/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD index 2bdc6ec67..cf775aaa4 100644 --- a/pcr/mathjax/PKGBUILD +++ b/pcr/mathjax/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Kevin Dodd -# Contributor: Tianjiao Yin +# Maintainer (Arch): Kevin Dodd +# Contributor (Arch): Tianjiao Yin pkgname=mathjax pkgver=2.3 diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD index 261bb9889..0649b1752 100755 --- a/pcr/md5deep/PKGBUILD +++ b/pcr/md5deep/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: billycongo -# Maintainer: dkaylor -# Maintainer (Parabola): Esteban Carnevale +# Contributor (Arch): billycongo +# Maintainer (Arch): dkaylor +# Maintainer: Esteban Carnevale pkgname=md5deep pkgver=4.4 diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD index f07e12748..ee2f996e0 100644 --- a/pcr/mediatomb/PKGBUILD +++ b/pcr/mediatomb/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: Peter Richard Lewis -# Contributor: William Rea -# Contributor: Nikhil Bysani -# Contributor: Mika Hynnä -# Contributor: Jonathan Conder +# Contributor (Arch): Peter Richard Lewis +# Contributor (Arch): William Rea +# Contributor (Arch): Nikhil Bysani +# Contributor (Arch): Mika Hynnä +# Contributor (Arch): Jonathan Conder # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=mediatomb diff --git a/pcr/mesa-nvfx/PKGBUILD b/pcr/mesa-nvfx/PKGBUILD index 4caacabf8..a26019abd 100644 --- a/pcr/mesa-nvfx/PKGBUILD +++ b/pcr/mesa-nvfx/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $ -# Maintainer: Jan de Groot -# Maintainer: Andreas Radke -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jan de Groot +# Maintainer (Arch): Andreas Radke +# Maintainer: Márcio Silva pkgbase=mesa-nvfx pkgname=('nouveau-nvfx-dri' 'svga-nvfx-dri' 'mesa-nvfx' 'mesa-nvfx-libgl') diff --git a/pcr/mimms/PKGBUILD b/pcr/mimms/PKGBUILD index 3697c1a3b..3f2a9207e 100644 --- a/pcr/mimms/PKGBUILD +++ b/pcr/mimms/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (Arch): Jaroslav Lichtblau -# Maintainer (Parabola): Alon Ivtsan +# Maintainer: Alon Ivtsan # taken from https://aur.archlinux.org/packages/mimms/ pkgname=mimms diff --git a/pcr/minetest-git/PKGBUILD b/pcr/minetest-git/PKGBUILD index e322285cf..b9f2e95af 100644 --- a/pcr/minetest-git/PKGBUILD +++ b/pcr/minetest-git/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Konsta Kokkinen -# Maintainer (Parabola): Jorge Araya Navarro -# Contributor (Parabola): André Silva +# Maintainer (Arch): Konsta Kokkinen +# Maintainer: Jorge Araya Navarro +# Contributor: André Silva pkgname=minetest-git pkgver=20130501 pkgrel=1 diff --git a/pcr/mini18n-git/PKGBUILD b/pcr/mini18n-git/PKGBUILD index c55db7b7d..3af0dfad8 100644 --- a/pcr/mini18n-git/PKGBUILD +++ b/pcr/mini18n-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Gustavo alvarez +# Maintainer (Arch): Gustavo alvarez pkgname=mini18n-git pkgver=20130213 diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD index 700f3c1f6..eb5f25e80 100644 --- a/pcr/minidjvu/PKGBUILD +++ b/pcr/minidjvu/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Orivej Desh -# Maintainer: Orivej Desh +# Contributor (Arch): Orivej Desh +# Maintainer (Arch): Orivej Desh pkgname=minidjvu pkgver=0.8 pkgrel=3 diff --git a/pcr/mit-scheme/PKGBUILD b/pcr/mit-scheme/PKGBUILD index f769acfc8..7ab2e544e 100644 --- a/pcr/mit-scheme/PKGBUILD +++ b/pcr/mit-scheme/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: peter feigl +# Contributor (Arch): peter feigl # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=mit-scheme diff --git a/pcr/moblock/PKGBUILD b/pcr/moblock/PKGBUILD index 15504d1c1..787b1f633 100644 --- a/pcr/moblock/PKGBUILD +++ b/pcr/moblock/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Kevin Edmonds -# Contributor: Filip Wojciechowski, filip at loka dot pl +# Contributor (Arch): Kevin Edmonds +# Contributor (Arch): Filip Wojciechowski, filip at loka dot pl # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=moblock diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD index 360d8a4a8..813bd9817 100644 --- a/pcr/monkeysign/PKGBUILD +++ b/pcr/monkeysign/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: fauno -# Contributor: max-k +# Contributor (Arch): max-k pkgname=monkeysign pkgver=1.1 pkgrel=1 diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index 749cb0c25..867ae171e 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: fauno # Based on monkeysphere-git from -# Contributor: Olivier Mehani +# Contributor (Arch): Olivier Mehani # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.36 diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index 2f765ad13..24bbd9961 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -1,6 +1,6 @@ # This is the PKGBUILD for mosquitto, an MQTT broker and example clients -# Maintainer: Alexander Rust -# Contributor: Dan Anderson +# Maintainer (Arch): Alexander Rust +# Contributor (Arch): Dan Anderson pkgname=mosquitto pkgver=1.1.3 diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD index dfcf99c03..632056457 100644 --- a/pcr/msdl/PKGBUILD +++ b/pcr/msdl/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Nathan Owe ndowens04 at gmail dot com -# Contributor: noonov +# Contributor (Arch): Nathan Owe ndowens04 at gmail dot com +# Contributor (Arch): noonov pkgname=msdl pkgver=1.2.7_r2 diff --git a/pcr/multipath-tools/PKGBUILD b/pcr/multipath-tools/PKGBUILD index b497d0f60..24bb27921 100644 --- a/pcr/multipath-tools/PKGBUILD +++ b/pcr/multipath-tools/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Justin Dray -# Contributor: Patrick McCarty -# Contributor: Bartłomiej Piotrowski -# Contributor: Thomas S Hatch -# Contributor: Michael P -# Contributor: Matt Heagney +# Maintainer (Arch): Justin Dray +# Contributor (Arch): Patrick McCarty +# Contributor (Arch): Bartłomiej Piotrowski +# Contributor (Arch): Thomas S Hatch +# Contributor (Arch): Michael P +# Contributor (Arch): Matt Heagney pkgname=multipath-tools pkgver=0.5.0 diff --git a/pcr/multiwatch/PKGBUILD b/pcr/multiwatch/PKGBUILD index 2cf0bcc68..0bf698bbc 100644 --- a/pcr/multiwatch/PKGBUILD +++ b/pcr/multiwatch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Paul Dann +# Maintainer (Arch): Paul Dann pkgname=multiwatch pkgver='1.0.0' pkgrel=1 diff --git a/pcr/musescore/PKGBUILD b/pcr/musescore/PKGBUILD index 8acfecfeb..b7abf5877 100644 --- a/pcr/musescore/PKGBUILD +++ b/pcr/musescore/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Stefan Husmann -# Contributor: Dr.Egg +# Maintainer (Arch): Stefan Husmann +# Contributor (Arch): Dr.Egg pkgname=musescore pkgver=1.3 diff --git a/pcr/mycron-git/PKGBUILD b/pcr/mycron-git/PKGBUILD index 16022bc5f..c80b79b1d 100644 --- a/pcr/mycron-git/PKGBUILD +++ b/pcr/mycron-git/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Dirk Sohler +# Contributor (Arch): Dirk Sohler # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=mycron-git diff --git a/pcr/nagios-nrpe-plugin/PKGBUILD b/pcr/nagios-nrpe-plugin/PKGBUILD index 3f2cba3c0..0a420b93d 100644 --- a/pcr/nagios-nrpe-plugin/PKGBUILD +++ b/pcr/nagios-nrpe-plugin/PKGBUILD @@ -1,6 +1,6 @@ # https://github.com/mvgrimes/aur-nagios-npre-plugin -# Contributor: Mark Grimes -# Contributor: Idares +# Contributor (Arch): Mark Grimes +# Contributor (Arch): Idares # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=nagios-nrpe-plugin diff --git a/pcr/nagios-plugins/PKGBUILD b/pcr/nagios-plugins/PKGBUILD index e1379d193..1434d2dee 100644 --- a/pcr/nagios-plugins/PKGBUILD +++ b/pcr/nagios-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Idares +# Contributor (Arch): Idares # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=nagios-plugins diff --git a/pcr/nautilus-dropbox/PKGBUILD b/pcr/nautilus-dropbox/PKGBUILD index c8a81a959..fc4b0c6c6 100644 --- a/pcr/nautilus-dropbox/PKGBUILD +++ b/pcr/nautilus-dropbox/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: josephgbr -# Contributor: cmorlok -# Contributor: fazibear -# Contributor: neuromante -# Contributor: Gordin <9ordin @t gmail.com> +# Contributor (Arch): josephgbr +# Contributor (Arch): cmorlok +# Contributor (Arch): fazibear +# Contributor (Arch): neuromante +# Contributor (Arch): Gordin <9ordin @t gmail.com> # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires pkgname=nautilus-dropbox diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index b16132dab..b91eb7ff4 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: SJ_UnderWater +# Maintainer (Arch): SJ_UnderWater # Based on netatalk package : -# Maintainer: Dominik Dingel -# Contributor: William Udovich -# Contributor: Farhan Yousaf +# Maintainer (Arch): Dominik Dingel +# Contributor (Arch): William Udovich +# Contributor (Arch): Farhan Yousaf pkgname=netatalk pkgver=3.0.4 diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD index 16ff977b3..715c578d0 100644 --- a/pcr/networkmanager-openswan/PKGBUILD +++ b/pcr/networkmanager-openswan/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Marti Raudsepp +# Contributor (Arch): Marti Raudsepp pkgname=networkmanager-openswan _pkgname=NetworkManager-openswan diff --git a/pcr/networkmanager-strongswan/PKGBUILD b/pcr/networkmanager-strongswan/PKGBUILD index 31573dc82..7133769f2 100644 --- a/pcr/networkmanager-strongswan/PKGBUILD +++ b/pcr/networkmanager-strongswan/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Michael Seiwald -# Maintainer: Dmitry Korzhevin +# Contributor (Arch): Michael Seiwald +# Maintainer (Arch): Dmitry Korzhevin pkgname=networkmanager-strongswan _pkgname=NetworkManager-strongswan pkgver=1.3.0 diff --git a/pcr/nevow/PKGBUILD b/pcr/nevow/PKGBUILD index 956a0cd32..1d7732d07 100644 --- a/pcr/nevow/PKGBUILD +++ b/pcr/nevow/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Nicolas Pouillard -# Contributor: Peter Simons +# Maintainer (Arch): Nicolas Pouillard +# Contributor (Arch): Peter Simons pkgname=nevow pkgver=0.10.0 pkgrel=8 diff --git a/pcr/newlisp/PKGBUILD b/pcr/newlisp/PKGBUILD index a53106390..e16ab99a5 100644 --- a/pcr/newlisp/PKGBUILD +++ b/pcr/newlisp/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: scrawler +# Contributor (Arch): scrawler # Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES pkgname=newlisp diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD index f6d3ba62c..640f85f30 100644 --- a/pcr/nexuiz-data/PKGBUILD +++ b/pcr/nexuiz-data/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Xyne -# Contributor: Rick Chen (stuffcorpse) -# Contributor: Jaroslaw Swierczynski -# Contributor: Roman Kyrylych -# Contributor: Camille Moncelier +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Xyne +# Contributor (Arch): Rick Chen (stuffcorpse) +# Contributor (Arch): Jaroslaw Swierczynski +# Contributor (Arch): Roman Kyrylych +# Contributor (Arch): Camille Moncelier pkgname=nexuiz-data _pkgsourcename=nexuiz diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD index 1e3fdfbeb..e2045c159 100644 --- a/pcr/nexuiz/PKGBUILD +++ b/pcr/nexuiz/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Xyne -# Contributor: Rick Chen (stuffcorpse) -# Contributor: Jaroslaw Swierczynski -# Contributor: Roman Kyrylych -# Contributor: Camille Moncelier +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Xyne +# Contributor (Arch): Rick Chen (stuffcorpse) +# Contributor (Arch): Jaroslaw Swierczynski +# Contributor (Arch): Roman Kyrylych +# Contributor (Arch): Camille Moncelier pkgname=nexuiz pkgver=2.5.2 diff --git a/pcr/nfacct/PKGBUILD b/pcr/nfacct/PKGBUILD index 88af2acb5..4558b77b2 100644 --- a/pcr/nfacct/PKGBUILD +++ b/pcr/nfacct/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Alessandro Sagratini +# Contributor (Arch): Alessandro Sagratini # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=nfacct diff --git a/pcr/note/PKGBUILD b/pcr/note/PKGBUILD index f4b2eefe2..044a73c92 100644 --- a/pcr/note/PKGBUILD +++ b/pcr/note/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: David Pflug +# Contributor (Arch): David Pflug # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres _author=TLINDEN diff --git a/pcr/nova/PKGBUILD b/pcr/nova/PKGBUILD index 181e5a626..524d62152 100644 --- a/pcr/nova/PKGBUILD +++ b/pcr/nova/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Josh Chase +# Contributor (Arch): Josh Chase # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=nova diff --git a/pcr/npapi-vlc-git/PKGBUILD b/pcr/npapi-vlc-git/PKGBUILD index 59b11bff6..6c7f89301 100644 --- a/pcr/npapi-vlc-git/PKGBUILD +++ b/pcr/npapi-vlc-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Det -# Contributor: Pimper (M0Rf30) +# Maintainer (Arch): Det +# Contributor (Arch): Pimper (M0Rf30) _pkgname=npapi-vlc pkgname=$_pkgname-git diff --git a/pcr/ocaml-camomile/PKGBUILD b/pcr/ocaml-camomile/PKGBUILD index 48c8eb2f9..213d8b805 100644 --- a/pcr/ocaml-camomile/PKGBUILD +++ b/pcr/ocaml-camomile/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Serge Zirukin +# Contributor (Arch): Serge Zirukin # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ocaml-camomile diff --git a/pcr/ocaml-pcre/PKGBUILD b/pcr/ocaml-pcre/PKGBUILD index bfc214b28..b2945798b 100644 --- a/pcr/ocaml-pcre/PKGBUILD +++ b/pcr/ocaml-pcre/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Serge Zirukin -# Contributor: Sergei Lebedev -# Contributor: Magnus Therning +# Contributor (Arch): Serge Zirukin +# Contributor (Arch): Sergei Lebedev +# Contributor (Arch): Magnus Therning # Maintainer : Parabola GNU / Linux-libre pkgname=ocaml-pcre diff --git a/pcr/ocrodjvu/PKGBUILD b/pcr/ocrodjvu/PKGBUILD index 296b9d433..a61685702 100644 --- a/pcr/ocrodjvu/PKGBUILD +++ b/pcr/ocrodjvu/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Francois Garillot -# Contributor: Malkov Fyodor aka krox: iksut@yandex.ru +# Maintainer (Arch): Francois Garillot +# Contributor (Arch): Malkov Fyodor aka krox: iksut@yandex.ru pkgname=ocrodjvu pkgver=0.7.13 pkgrel=1 diff --git a/pcr/oggfwd/PKGBUILD b/pcr/oggfwd/PKGBUILD index 5dd9e4680..70665128c 100644 --- a/pcr/oggfwd/PKGBUILD +++ b/pcr/oggfwd/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: farid abdelnour < farid at atelier-labs.org> +# Contributor (Arch): farid abdelnour < farid at atelier-labs.org> pkgname=oggfwd pkgver=0.2 diff --git a/pcr/oinkmaster/PKGBUILD b/pcr/oinkmaster/PKGBUILD index f533e3663..da20ac3f9 100644 --- a/pcr/oinkmaster/PKGBUILD +++ b/pcr/oinkmaster/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Robert Knauer -# Contributor: Kessia Pinheiro +# Contributor (Arch): Robert Knauer +# Contributor (Arch): Kessia Pinheiro # Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières pkgname=oinkmaster diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD index 668e39cea..3f45ce5e9 100644 --- a/pcr/olsrd/PKGBUILD +++ b/pcr/olsrd/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: William Rea -# Maintainer: Claudio Pisa +# Contributor (Arch): William Rea +# Maintainer (Arch): Claudio Pisa pkgname=olsrd pkgver=0.6.1 pkgrel=2 diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD index c3e2c753f..6542f140d 100644 --- a/pcr/openchange/PKGBUILD +++ b/pcr/openchange/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Michael Hansen -# Contributor: ngoonee -# Contributor: Adam Russell +# Maintainer (Arch): Michael Hansen +# Contributor (Arch): ngoonee +# Contributor (Arch): Adam Russell pkgname=openchange _codename=BORG _dlid=180 diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD index 065a1ec68..7fd21e3ec 100644 --- a/pcr/opendnssec/PKGBUILD +++ b/pcr/opendnssec/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Javier Torres +# Maintainer (Arch): Javier Torres pkgname=opendnssec pkgver=1.4.0 diff --git a/pcr/openicc/PKGBUILD b/pcr/openicc/PKGBUILD index 8db1cf82d..18642a1a5 100644 --- a/pcr/openicc/PKGBUILD +++ b/pcr/openicc/PKGBUILD @@ -1,4 +1,4 @@ -#Maintainer: M0Rf30 +#Maintainer (Arch): M0Rf30 pkgname=openicc pkgver=1.3.1 diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD index 03cdba0aa..33b6c17e9 100644 --- a/pcr/openjdk6/PKGBUILD +++ b/pcr/openjdk6/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 178352 2013-02-20 17:00:42Z andyrtr $ -# Maintainer: Andreas Radke -# Contributor: Jan de Groot +# Maintainer (Arch): Andreas Radke +# Contributor (Arch): Jan de Groot pkgname='openjdk6-old' pkgbase="openjdk6" diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index ab7bd69f5..3d20cb08d 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: xjpvictor Huang +# Contributor (Arch): xjpvictor Huang pkgname=openswan pkgver=2.6.38 pkgrel=2 diff --git a/pcr/opentracker/PKGBUILD b/pcr/opentracker/PKGBUILD index d40898859..f1940b8f8 100644 --- a/pcr/opentracker/PKGBUILD +++ b/pcr/opentracker/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Pierre Schmitz -# Maintainer: Jonas Heinrich +# Contributor (Arch): Pierre Schmitz +# Maintainer (Arch): Jonas Heinrich pkgname=opentracker pkgver=20130312 diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD index 6a9b2d62c..8fe871305 100644 --- a/pcr/otf-stix/PKGBUILD +++ b/pcr/otf-stix/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (Arch): ezzetabi -# Maintainer (Parabola): Alon Ivtsan +# Maintainer: Alon Ivtsan # taken from https://aur.archlinux.org/packages/otf-stix/ pkgname=otf-stix diff --git a/pcr/owncloud-app-roundcube/PKGBUILD b/pcr/owncloud-app-roundcube/PKGBUILD index 050925d8c..8b3a9beb0 100644 --- a/pcr/owncloud-app-roundcube/PKGBUILD +++ b/pcr/owncloud-app-roundcube/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 103944 2014-01-13 20:31:53Z spupykin $ -# Contributor: Sergej Pupykin +# Contributor (Arch): Sergej Pupykin # Maintainer : Parabola Aurélien Desbrières pkgname=owncloud-app-roundcube diff --git a/pcr/owncloud/PKGBUILD b/pcr/owncloud/PKGBUILD index 18e33afe2..1369d4b0f 100644 --- a/pcr/owncloud/PKGBUILD +++ b/pcr/owncloud/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Antonio Rojas +# Maintainer (Arch): Antonio Rojas # Based on owncloud-git PKGBUILD by Alexander Ovsyannikov pkgname=owncloud diff --git a/pcr/package-query/PKGBUILD b/pcr/package-query/PKGBUILD index 5bec58ce3..6c06f5ae9 100644 --- a/pcr/package-query/PKGBUILD +++ b/pcr/package-query/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: tuxce +# Contributor (Arch): tuxce # Maintainer : Parabola GNU / Linux-libre pkgname=package-query diff --git a/pcr/pacman-color/PKGBUILD b/pcr/pacman-color/PKGBUILD index 525f965b9..21944c31e 100644 --- a/pcr/pacman-color/PKGBUILD +++ b/pcr/pacman-color/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: JokerBoy -# Contributor: vogo +# Contributor (Arch): JokerBoy +# Contributor (Arch): vogo # Maintainer : Parabola GNU / Linux-libre pkgname=pacman-color diff --git a/pcr/pactools/PKGBUILD b/pcr/pactools/PKGBUILD index d05953b99..859b4db6b 100644 --- a/pcr/pactools/PKGBUILD +++ b/pcr/pactools/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Pierluigi +# Contributor (Arch): Pierluigi # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=pactools diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD index 2a6c0fac3..c86601271 100644 --- a/pcr/par/PKGBUILD +++ b/pcr/par/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Federico Quagliata (quaqo) -# Contributor: quantax -- contact via Arch Linux forum or AUR +# Contributor (Arch): Federico Quagliata (quaqo) +# Contributor (Arch): quantax -- contact via Arch Linux forum or AUR pkgname=par pkgver=1.52 diff --git a/pcr/pdsh/PKGBUILD b/pcr/pdsh/PKGBUILD index 0f4fc2461..2a01c667d 100644 --- a/pcr/pdsh/PKGBUILD +++ b/pcr/pdsh/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: drrossum -# Contributor: sh0 +# Contributor (Arch): drrossum +# Contributor (Arch): sh0 # Maintainer : Aurelien Desbrieres pkgname=pdsh diff --git a/pcr/perl-astro-suntime/PKGBUILD b/pcr/perl-astro-suntime/PKGBUILD index d615aa3af..2c81bbd8c 100644 --- a/pcr/perl-astro-suntime/PKGBUILD +++ b/pcr/perl-astro-suntime/PKGBUILD @@ -1,5 +1,5 @@ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: Ross melin +# Contributor (Arch): Ross melin # Required by zoneminder diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD index e2c9b5a3c..8b5779bdc 100644 --- a/pcr/perl-crypt-dh/PKGBUILD +++ b/pcr/perl-crypt-dh/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer (AUR): Michael Witten # # Derived from perl-crypt-blowfish: -# Contributor: Sergej Pupykin -# Contributor: Charles Mauch +# Contributor (Arch): Sergej Pupykin +# Contributor (Arch): Charles Mauch # -# Contributor: Pedro Alejandro López-Valencia +# Contributor (Arch): Pedro Alejandro López-Valencia pkgname=perl-crypt-dh pkgver=0.07 diff --git a/pcr/perl-expect/PKGBUILD b/pcr/perl-expect/PKGBUILD index 298cb623b..da008dcfd 100644 --- a/pcr/perl-expect/PKGBUILD +++ b/pcr/perl-expect/PKGBUILD @@ -1,8 +1,8 @@ # CPAN Name : Expect -# Contributor: Max Roder -# Contributor: DarkHeart +# Contributor (Arch): Max Roder +# Contributor (Arch): DarkHeart # Generator : CPANPLUS::Dist::Arch 1.19 -# Maintainer (Parabola): Márcio Silva +# Maintainer: Márcio Silva pkgname='perl-expect' pkgver='1.21' diff --git a/pcr/perl-file-find-rule/PKGBUILD b/pcr/perl-file-find-rule/PKGBUILD index 7953217a3..705b6fba6 100644 --- a/pcr/perl-file-find-rule/PKGBUILD +++ b/pcr/perl-file-find-rule/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Blaž Tomažič +# Contributor (Arch): Blaž Tomažič # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=perl-file-find-rule diff --git a/pcr/perl-iptables-chainmgr/PKGBUILD b/pcr/perl-iptables-chainmgr/PKGBUILD index e45a1faf3..f3dbcd5fc 100644 --- a/pcr/perl-iptables-chainmgr/PKGBUILD +++ b/pcr/perl-iptables-chainmgr/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Weirch Sodora +# Contributor (Arch): Weirch Sodora # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=perl-iptables-chainmgr diff --git a/pcr/perl-iptables-parse/PKGBUILD b/pcr/perl-iptables-parse/PKGBUILD index 94fe8e17a..2883b7429 100644 --- a/pcr/perl-iptables-parse/PKGBUILD +++ b/pcr/perl-iptables-parse/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Weirch Sodora +# Contributor (Arch): Weirch Sodora # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=perl-iptables-parse diff --git a/pcr/perl-latex-encode/PKGBUILD b/pcr/perl-latex-encode/PKGBUILD index ef7d98b37..49e7fab1b 100644 --- a/pcr/perl-latex-encode/PKGBUILD +++ b/pcr/perl-latex-encode/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Moritz Bunkus +# Maintainer (Arch): Moritz Bunkus pkgname=perl-latex-encode pkgver=0.08 diff --git a/pcr/perl-net-sftp-foreign/PKGBUILD b/pcr/perl-net-sftp-foreign/PKGBUILD index 5bb9a69a4..dfce58f00 100644 --- a/pcr/perl-net-sftp-foreign/PKGBUILD +++ b/pcr/perl-net-sftp-foreign/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Alessandro Sagratini +# Contributor (Arch): Alessandro Sagratini pkgname=perl-net-sftp-foreign pkgver=1.75 pkgrel=1 diff --git a/pcr/perl-number-compare/PKGBUILD b/pcr/perl-number-compare/PKGBUILD index 64566aa10..889f40212 100644 --- a/pcr/perl-number-compare/PKGBUILD +++ b/pcr/perl-number-compare/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Blaž Tomažič +# Contributor (Arch): Blaž Tomažič # Maintainer : Parabola GNU / Linux-libre pkgname=perl-number-compare diff --git a/pcr/perl-php-serialization/PKGBUILD b/pcr/perl-php-serialization/PKGBUILD index 5ccc64e40..8bfc2661f 100644 --- a/pcr/perl-php-serialization/PKGBUILD +++ b/pcr/perl-php-serialization/PKGBUILD @@ -1,5 +1,5 @@ # CPAN Name : PHP-Serialization -# Contributor: John D Jones III +# Contributor (Arch): John D Jones III # Generator : CPANPLUS::Dist::Arch 1.25 pkgname='perl-php-serialization' diff --git a/pcr/perl-sys-mmap/PKGBUILD b/pcr/perl-sys-mmap/PKGBUILD index 43540e07f..4b7bf1d47 100644 --- a/pcr/perl-sys-mmap/PKGBUILD +++ b/pcr/perl-sys-mmap/PKGBUILD @@ -1,5 +1,5 @@ # CPAN Name : Sys-Mmap -# Contributor: John D Jones III +# Contributor (Arch): John D Jones III # Generator : CPANPLUS::Dist::Arch 1.25 pkgname='perl-sys-mmap' diff --git a/pcr/perl-text-glob/PKGBUILD b/pcr/perl-text-glob/PKGBUILD index 194ab831c..80f8bd968 100644 --- a/pcr/perl-text-glob/PKGBUILD +++ b/pcr/perl-text-glob/PKGBUILD @@ -1,5 +1,5 @@ # CPAN Name : Text-Glob -# Contributor: Alan Young +# Contributor (Arch): Alan Young # Generator : CPANPLUS::Dist::Arch 1.21 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/perl-unicode-map/PKGBUILD b/pcr/perl-unicode-map/PKGBUILD index 1d03e867d..92b1ac51c 100644 --- a/pcr/perl-unicode-map/PKGBUILD +++ b/pcr/perl-unicode-map/PKGBUILD @@ -1,5 +1,5 @@ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Contributor: Ross melin +# Contributor (Arch): Ross melin # Required by zoneminder diff --git a/pcr/perl-unix-syslog/PKGBUILD b/pcr/perl-unix-syslog/PKGBUILD index 5f4acd962..bbc9ce861 100644 --- a/pcr/perl-unix-syslog/PKGBUILD +++ b/pcr/perl-unix-syslog/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Justin Davis +# Contributor (Arch): Justin Davis # Generator : CPANPLUS::Dist::Arch 1.04 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/perl-x10/PKGBUILD b/pcr/perl-x10/PKGBUILD index 0a0d352cb..fb0eb5f16 100644 --- a/pcr/perl-x10/PKGBUILD +++ b/pcr/perl-x10/PKGBUILD @@ -1,5 +1,5 @@ # CPAN Name : X10 -# Contributor: John D Jones III +# Contributor (Arch): John D Jones III # Generator : CPANPLUS::Dist::Arch 1.25 pkgname='perl-x10' diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD index 9856e4d7c..15e5c4660 100644 --- a/pcr/plowshare/PKGBUILD +++ b/pcr/plowshare/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer : speps -# Contributor: breakdown +# Maintainer (Arch): speps +# Contributor (Arch): breakdown pkgname=plowshare pkgver=snapshot_git20140112.7ad41c8 diff --git a/pcr/pmount/PKGBUILD b/pcr/pmount/PKGBUILD index 46c2b0358..61e90ac8a 100644 --- a/pcr/pmount/PKGBUILD +++ b/pcr/pmount/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $ -# Maintainer: Tobias Powalowski +# Maintainer (Arch): Tobias Powalowski pkgname=pmount pkgver=0.9.23 diff --git a/pcr/poco/PKGBUILD b/pcr/poco/PKGBUILD index dad4788d1..74b7ffe33 100644 --- a/pcr/poco/PKGBUILD +++ b/pcr/poco/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Rodrigo Grumiche Silva -# Contributor: nozog -# Contributor: davidhjelm -# Contributor: Ray Kohler -# Contributor: Nathan Owe < ndowens04 at gmail dot com> +# Maintainer (Arch): Rodrigo Grumiche Silva +# Contributor (Arch): nozog +# Contributor (Arch): davidhjelm +# Contributor (Arch): Ray Kohler +# Contributor (Arch): Nathan Owe < ndowens04 at gmail dot com> pkgname=poco pkgver=1.4.2p1 diff --git a/pcr/polarssl/PKGBUILD b/pcr/polarssl/PKGBUILD index 9d547d1d1..cf24d05ae 100644 --- a/pcr/polarssl/PKGBUILD +++ b/pcr/polarssl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mihai Militaru +# Maintainer (Arch): Mihai Militaru pkgname=polarssl pkgver=1.2.8 diff --git a/pcr/prboom/PKGBUILD b/pcr/prboom/PKGBUILD index 03f53784e..636dc134f 100644 --- a/pcr/prboom/PKGBUILD +++ b/pcr/prboom/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 77655 2012-10-13 11:44:28Z allan $ -# Maintainer: Lukas Fleischer -# Contributor: Thayer Williams -# Contributor: dale +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): Thayer Williams +# Contributor (Arch): dale pkgname=prboom pkgver=2.5.0 diff --git a/pcr/psad/PKGBUILD b/pcr/psad/PKGBUILD index 145625e89..221e7d05a 100644 --- a/pcr/psad/PKGBUILD +++ b/pcr/psad/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Artur Wojcik +# Maintainer (Arch): Artur Wojcik # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=psad diff --git a/pcr/pspp/PKGBUILD b/pcr/pspp/PKGBUILD index d0042745f..a0b668b84 100644 --- a/pcr/pspp/PKGBUILD +++ b/pcr/pspp/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Miguel Revilla -# Contributor: joyfulgirl +# Maintainer (Arch): Miguel Revilla +# Contributor (Arch): joyfulgirl pkgname=pspp pkgver=0.8.2 pkgrel=1 diff --git a/pcr/pulledpork/PKGBUILD b/pcr/pulledpork/PKGBUILD index db7aa9d0d..aeeac0a04 100644 --- a/pcr/pulledpork/PKGBUILD +++ b/pcr/pulledpork/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Isaac C. Aronson +# Contributor (Arch): Isaac C. Aronson # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=pulledpork diff --git a/pcr/puppet/PKGBUILD b/pcr/puppet/PKGBUILD index 02e8f32c8..512d8e884 100644 --- a/pcr/puppet/PKGBUILD +++ b/pcr/puppet/PKGBUILD @@ -1,11 +1,11 @@ # Puppet: Installer: Arch -# Contributor: Greg Sutcliffe -# Contributor: Hyacinthe Cartiaux -# Contributor: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson -# Contributor: Dave Simons -# Contributor: Niels Abspoel +# Contributor (Arch): Greg Sutcliffe +# Contributor (Arch): Hyacinthe Cartiaux +# Contributor (Arch): Thomas S Hatch +# Contributor (Arch): Xavion +# Contributor (Arch): Miah Johnson +# Contributor (Arch): Dave Simons +# Contributor (Arch): Niels Abspoel # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres # RC style, reserved for later use diff --git a/pcr/puppet/puppet.install b/pcr/puppet/puppet.install index 928df566b..12f800a5c 100644 --- a/pcr/puppet/puppet.install +++ b/pcr/puppet/puppet.install @@ -1,7 +1,7 @@ # Puppet: Installer: Arch -# Maintainer: Thomas S Hatch -# Contributor: Xavion -# Contributor: Miah Johnson +# Maintainer (Arch): Thomas S Hatch +# Contributor (Arch): Xavion +# Contributor (Arch): Miah Johnson pre_install() { getent group puppet &>/dev/null || groupadd -r puppet -g 52 &>/dev/null diff --git a/pcr/pybitmessage-git/PKGBUILD b/pcr/pybitmessage-git/PKGBUILD index a62d45523..f1d577a71 100644 --- a/pcr/pybitmessage-git/PKGBUILD +++ b/pcr/pybitmessage-git/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Andreas Wagner -# Maintainer: Andy Weidenbaum -# Contributor: Asta -# Contributor: ptrv +# Maintainer (Arch): Andreas Wagner +# Maintainer (Arch): Andy Weidenbaum +# Contributor (Arch): Asta +# Contributor (Arch): ptrv _pkgname=pybitmessage pkgname=${_pkgname}-git diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD index cb7d6bd45..b45dfd6ba 100644 --- a/pcr/pybonjour/PKGBUILD +++ b/pcr/pybonjour/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Ruben Schuller +# Contributor (Arch): Ruben Schuller pkgname=pybonjour pkgver=1.1.1 diff --git a/pcr/pycryptopp/PKGBUILD b/pcr/pycryptopp/PKGBUILD index f95654884..54f8cda8a 100644 --- a/pcr/pycryptopp/PKGBUILD +++ b/pcr/pycryptopp/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Nicolas Pouillard -# Contributor: Peter Simons +# Maintainer (Arch): Nicolas Pouillard +# Contributor (Arch): Peter Simons pkgname=pycryptopp pkgver=0.6.0 _pkgtag=1206569328141510525648634803928199668821045408958 diff --git a/pcr/pysheng/PKGBUILD b/pcr/pysheng/PKGBUILD index 4cbdf5d38..13b21901e 100644 --- a/pcr/pysheng/PKGBUILD +++ b/pcr/pysheng/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: mutlu_inek@yahoo.de +# Contributor (Arch): mutlu_inek@yahoo.de # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=pysheng diff --git a/pcr/python-anyjson/PKGBUILD b/pcr/python-anyjson/PKGBUILD index 8ab20d1c9..13c28443f 100644 --- a/pcr/python-anyjson/PKGBUILD +++ b/pcr/python-anyjson/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Benjamin A. Shelton -# Contributor: p2k +# Contributor (Arch): Benjamin A. Shelton +# Contributor (Arch): p2k # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python-anyjson diff --git a/pcr/python-efl/PKGBUILD b/pcr/python-efl/PKGBUILD index d805e49ca..e67489ad2 100644 --- a/pcr/python-efl/PKGBUILD +++ b/pcr/python-efl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Doug Newgard +# Maintainer (Arch): Doug Newgard _python=python pkgname=$_python-efl diff --git a/pcr/python-jedi/PKGBUILD b/pcr/python-jedi/PKGBUILD index d34823097..326a27631 100644 --- a/pcr/python-jedi/PKGBUILD +++ b/pcr/python-jedi/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jesus Alvarez -# Contributor: Danilo Bargen +# Contributor (Arch): Jesus Alvarez +# Contributor (Arch): Danilo Bargen # Maintainer : Parabola Aurélien DESBRIÈRES pkgname=python-jedi pkgver=0.7.0 diff --git a/pcr/python-lirc/PKGBUILD b/pcr/python-lirc/PKGBUILD index 06e6988ef..95094650d 100644 --- a/pcr/python-lirc/PKGBUILD +++ b/pcr/python-lirc/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Contributor: Eelco Cramer +# Contributor (Arch): Eelco Cramer # Maintainer : Parabola Aurélien Desbrières pkgname=python-lirc diff --git a/pcr/python-paste-deploy/PKGBUILD b/pcr/python-paste-deploy/PKGBUILD index 57b7ca0d3..fa87c2231 100644 --- a/pcr/python-paste-deploy/PKGBUILD +++ b/pcr/python-paste-deploy/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: David Campbell -# Contributor: Cilyan Olowen +# Contributor (Arch): David Campbell +# Contributor (Arch): Cilyan Olowen # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python-paste-deploy diff --git a/pcr/python-paste/PKGBUILD b/pcr/python-paste/PKGBUILD index 3ffc12ca3..9ce5e6388 100644 --- a/pcr/python-paste/PKGBUILD +++ b/pcr/python-paste/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: David Campbell -# Contributor: Cilyan Olowen +# Contributor (Arch): David Campbell +# Contributor (Arch): Cilyan Olowen # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python-paste diff --git a/pcr/python-prettytable/PKGBUILD b/pcr/python-prettytable/PKGBUILD index 92d42f18e..2f0440149 100644 --- a/pcr/python-prettytable/PKGBUILD +++ b/pcr/python-prettytable/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Emmanuel Gil Peyrot -# Contributor: Xiao Er -# Contributor: Victor Noel +# Maintainer (Arch): Emmanuel Gil Peyrot +# Contributor (Arch): Xiao Er +# Contributor (Arch): Victor Noel # Hack for AUR pkgname='python2-prettytable' diff --git a/pcr/python-repoze.lru/PKGBUILD b/pcr/python-repoze.lru/PKGBUILD index 844658c27..70b95cb7e 100644 --- a/pcr/python-repoze.lru/PKGBUILD +++ b/pcr/python-repoze.lru/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: speps -# Contributor: DasIch +# Contributor (Arch): speps +# Contributor (Arch): DasIch # Maintainer : Paraobla GNU / Linux-libre Aurelien Desbrieres _name=repoze.lru diff --git a/pcr/python-routes/PKGBUILD b/pcr/python-routes/PKGBUILD index 511934ef2..f6cba313b 100644 --- a/pcr/python-routes/PKGBUILD +++ b/pcr/python-routes/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: SpepS -# Contributor: David Moore -# Contributor: Nathan Jones +# Contributor (Arch): SpepS +# Contributor (Arch): David Moore +# Contributor (Arch): Nathan Jones # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python-routes diff --git a/pcr/python-wsgiref/PKGBUILD b/pcr/python-wsgiref/PKGBUILD index 3f3b38bd2..0ce289a14 100644 --- a/pcr/python-wsgiref/PKGBUILD +++ b/pcr/python-wsgiref/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Philipp Schmidt +# Contributor (Arch): Philipp Schmidt # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python-wsgiref diff --git a/pcr/python2-amqplib/PKGBUILD b/pcr/python2-amqplib/PKGBUILD index d67800a06..ef0aa30bb 100644 --- a/pcr/python2-amqplib/PKGBUILD +++ b/pcr/python2-amqplib/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Tevin Zhang +# Contributor (Arch): Tevin Zhang # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-amqplib diff --git a/pcr/python2-argparse/PKGBUILD b/pcr/python2-argparse/PKGBUILD index cda95c0e2..8cecb6889 100644 --- a/pcr/python2-argparse/PKGBUILD +++ b/pcr/python2-argparse/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Lukas Linhart -# Contributor: Changaco -# Contributor: Nicolas Pouillard +# Contributor (Arch): Lukas Linhart +# Contributor (Arch): Changaco +# Contributor (Arch): Nicolas Pouillard # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-argparse diff --git a/pcr/python2-carrot/PKGBUILD b/pcr/python2-carrot/PKGBUILD index b620eca9e..456586e4b 100644 --- a/pcr/python2-carrot/PKGBUILD +++ b/pcr/python2-carrot/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Lukas Linhart -# Contributor: Marco Elver +# Contributor (Arch): Lukas Linhart +# Contributor (Arch): Marco Elver # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-carrot diff --git a/pcr/python2-cheetah/PKGBUILD b/pcr/python2-cheetah/PKGBUILD index ea6b1036b..d4aa36c3a 100644 --- a/pcr/python2-cheetah/PKGBUILD +++ b/pcr/python2-cheetah/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Julien Nicoulaud -# Contributor: James Rayner -# Contributor: Todd Maynard +# Contributor (Arch): Julien Nicoulaud +# Contributor (Arch): James Rayner +# Contributor (Arch): Todd Maynard # Source: https://github.com/nicoulaj/archlinux-packages # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/python2-daemon/PKGBUILD b/pcr/python2-daemon/PKGBUILD index 18358f9cb..431ff7e8e 100644 --- a/pcr/python2-daemon/PKGBUILD +++ b/pcr/python2-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Massimiliano Torromeo +# Contributor (Arch): Massimiliano Torromeo # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-daemon diff --git a/pcr/python2-djvulibre/PKGBUILD b/pcr/python2-djvulibre/PKGBUILD index 0d648272a..19509a37c 100644 --- a/pcr/python2-djvulibre/PKGBUILD +++ b/pcr/python2-djvulibre/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Francois Garillot -# Contributor: Anton Bazhenov -# Contributor: Malkov Fyodor aka krox +# Maintainer (Arch): Francois Garillot +# Contributor (Arch): Anton Bazhenov +# Contributor (Arch): Malkov Fyodor aka krox pkgname=python2-djvulibre pkgver=0.3.9 diff --git a/pcr/python2-empy/PKGBUILD b/pcr/python2-empy/PKGBUILD index 3c4cd7bee..5c92c6e30 100644 --- a/pcr/python2-empy/PKGBUILD +++ b/pcr/python2-empy/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Andrew Conkling -# Contributor: hauptmech +# Contributor (Arch): Andrew Conkling +# Contributor (Arch): hauptmech # Maintainer : Parabola GNU / LInux-libre Aurelien Desbrieres pkgname=python2-empy diff --git a/pcr/python2-fabric/PKGBUILD b/pcr/python2-fabric/PKGBUILD index 7552eaabc..cd7062503 100644 --- a/pcr/python2-fabric/PKGBUILD +++ b/pcr/python2-fabric/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: Francois Boulogne +# Maintainer (Arch): Sven-Hendrik Haase +# Contributor (Arch): Francois Boulogne # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-fabric diff --git a/pcr/python2-iso8601/PKGBUILD b/pcr/python2-iso8601/PKGBUILD index 08ca49004..394ce11fb 100644 --- a/pcr/python2-iso8601/PKGBUILD +++ b/pcr/python2-iso8601/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: WU Jun -# Contributor: Vsevolod Balashov +# Contributor (Arch): WU Jun +# Contributor (Arch): Vsevolod Balashov # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres name=iso8601 diff --git a/pcr/python2-kombu/PKGBUILD b/pcr/python2-kombu/PKGBUILD index ef99b0beb..11021299b 100644 --- a/pcr/python2-kombu/PKGBUILD +++ b/pcr/python2-kombu/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Felix Yan +# Contributor (Arch): Felix Yan # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-kombu diff --git a/pcr/python2-mock/PKGBUILD b/pcr/python2-mock/PKGBUILD index 5647c15d2..4fc1cd611 100644 --- a/pcr/python2-mock/PKGBUILD +++ b/pcr/python2-mock/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Felix Kaiser +# Contributor (Arch): Felix Kaiser pkgname=python2-mock pkgver=1.0.1 diff --git a/pcr/python2-netaddr/PKGBUILD b/pcr/python2-netaddr/PKGBUILD index 8d9f2a827..b9d4da022 100644 --- a/pcr/python2-netaddr/PKGBUILD +++ b/pcr/python2-netaddr/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Sebastien LEDUC -# Contributor: Gilles CHAUVIN +# Contributor (Arch): Sebastien LEDUC +# Contributor (Arch): Gilles CHAUVIN # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-netaddr diff --git a/pcr/python2-oauth2/PKGBUILD b/pcr/python2-oauth2/PKGBUILD index c58e86f9c..e44c92152 100644 --- a/pcr/python2-oauth2/PKGBUILD +++ b/pcr/python2-oauth2/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Massimiliano Torromeo +# Contributor (Arch): Massimiliano Torromeo # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-oauth2 diff --git a/pcr/python2-passlib/PKGBUILD b/pcr/python2-passlib/PKGBUILD index 753677827..0fb516429 100644 --- a/pcr/python2-passlib/PKGBUILD +++ b/pcr/python2-passlib/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: onny -# Contributor: onny +# Contributor (Arch): onny +# Contributor (Arch): onny # Maintainer : Parabola GNU /Linux-libre Aurelien Desbrieres pkgname=python2-passlib diff --git a/pcr/python2-pkgtools/PKGBUILD b/pcr/python2-pkgtools/PKGBUILD index 7060dc416..3c97239ea 100644 --- a/pcr/python2-pkgtools/PKGBUILD +++ b/pcr/python2-pkgtools/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Fabien Devaux +# Contributor (Arch): Fabien Devaux # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-pkgtools diff --git a/pcr/python2-postfix-policyd-spf/PKGBUILD b/pcr/python2-postfix-policyd-spf/PKGBUILD index f5b96f752..a46528838 100644 --- a/pcr/python2-postfix-policyd-spf/PKGBUILD +++ b/pcr/python2-postfix-policyd-spf/PKGBUILD @@ -1,6 +1,6 @@ # From https://aur.archlinux.org/packages.php?ID=42275 -# Maintainer: Filip S. Adamsen -# Contributor: Samed Beyribey +# Maintainer (Arch): Filip S. Adamsen +# Contributor (Arch): Samed Beyribey pkgname=python2-postfix-policyd-spf _pkgname=pypolicyd-spf pkgver=1.1.2 diff --git a/pcr/python2-potr/PKGBUILD b/pcr/python2-potr/PKGBUILD index 684912283..e3cbe4651 100644 --- a/pcr/python2-potr/PKGBUILD +++ b/pcr/python2-potr/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Michael Düll +# Maintainer (Arch): Michael Düll pkgname=python2-potr pkgver=1.0.0 diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD index cc6662f70..cd180f68c 100644 --- a/pcr/python2-pycha/PKGBUILD +++ b/pcr/python2-pycha/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Jakub Klinkovský -# Contributor (Parabola): André Silva +# Maintainer (Arch): Jakub Klinkovský +# Contributor: André Silva pkgname=python2-pycha pkgver=279 pkgrel=1 diff --git a/pcr/python2-pydns/PKGBUILD b/pcr/python2-pydns/PKGBUILD index cf5f4b388..083bcc9e4 100644 --- a/pcr/python2-pydns/PKGBUILD +++ b/pcr/python2-pydns/PKGBUILD @@ -1,7 +1,7 @@ # Parabola maintainer: Michał Masłowski # From https://aur.archlinux.org/packages.php?ID=42273 -# Maintainer: Filip S. Adamsen -# Contributor: Samed Beyribey +# Maintainer (Arch): Filip S. Adamsen +# Contributor (Arch): Samed Beyribey pkgname=python2-pydns _pkgname=pydns pkgver=2.3.6 diff --git a/pcr/python2-pyspf/PKGBUILD b/pcr/python2-pyspf/PKGBUILD index abb3bfa5f..ee5373aa7 100644 --- a/pcr/python2-pyspf/PKGBUILD +++ b/pcr/python2-pyspf/PKGBUILD @@ -1,7 +1,7 @@ # Parabola maintainer: Michał Masłowski # From https://aur.archlinux.org/packages.php?ID=42274 -# Maintainer: Filip S. Adamsen -# Contributor: Samed Beyribey +# Maintainer (Arch): Filip S. Adamsen +# Contributor (Arch): Samed Beyribey pkgname=python2-pyspf _pkgname=pyspf pkgver=2.0.7 diff --git a/pcr/python2-pywebdav/PKGBUILD b/pcr/python2-pywebdav/PKGBUILD index 994bd4c4f..5623f7cc0 100644 --- a/pcr/python2-pywebdav/PKGBUILD +++ b/pcr/python2-pywebdav/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Dan Serban (dserban01 => gmail) -# Contributor: Gour +# Maintainer (Arch): Dan Serban (dserban01 => gmail) +# Contributor (Arch): Gour pkgname=python2-pywebdav pkgver=0.9.8 diff --git a/pcr/python2-qrcode/PKGBUILD b/pcr/python2-qrcode/PKGBUILD index a385056ba..bd339a295 100644 --- a/pcr/python2-qrcode/PKGBUILD +++ b/pcr/python2-qrcode/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Francois Boulogne -# Maintainer: Francois Boulogne +# Contributor (Arch): Francois Boulogne +# Maintainer (Arch): Francois Boulogne pkgname=python2-qrcode pkgver=4.0.4 diff --git a/pcr/python2-qrencode/PKGBUILD b/pcr/python2-qrencode/PKGBUILD index dd58c1885..3a6c14093 100644 --- a/pcr/python2-qrencode/PKGBUILD +++ b/pcr/python2-qrencode/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: ValHue +# Maintainer (Arch): ValHue # https://github.com/ValHue/AUR-PKGBUILDs # -# Contributor: sevkin +# Contributor (Arch): sevkin _python=python2 _name=qrencode diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD index 888cda81d..989b52210 100644 --- a/pcr/python2-relatorio/PKGBUILD +++ b/pcr/python2-relatorio/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Florian Walch -# Maintainer: Thomas Bahn -# Maintainer (Parabola): André Silva +# Contributor (Arch): Florian Walch +# Maintainer (Arch): Thomas Bahn +# Maintainer: André Silva pkgname=python2-relatorio pkgver=0.6.0 diff --git a/pcr/python2-ropemacs/PKGBUILD b/pcr/python2-ropemacs/PKGBUILD index 84c5661ba..d30f41141 100644 --- a/pcr/python2-ropemacs/PKGBUILD +++ b/pcr/python2-ropemacs/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Renato Garcia -# Contributor: yescalona +# Contributor (Arch): Renato Garcia +# Contributor (Arch): yescalona # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-ropemacs diff --git a/pcr/python2-ropemode/PKGBUILD b/pcr/python2-ropemode/PKGBUILD index bdeb58a68..db3c3581b 100644 --- a/pcr/python2-ropemode/PKGBUILD +++ b/pcr/python2-ropemode/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Renato Garcia -# Contributor: Nicolás de la Torre +# Contributor (Arch): Renato Garcia +# Contributor (Arch): Nicolás de la Torre # Maintainer : Parabola GNU / Linux-libre pkgname=python2-ropemode diff --git a/pcr/python2-rospkg/PKGBUILD b/pcr/python2-rospkg/PKGBUILD index cf6116ba0..875904f45 100644 --- a/pcr/python2-rospkg/PKGBUILD +++ b/pcr/python2-rospkg/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Somebody +# Contributor (Arch): Somebody # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres _name=rospkg pkgname=python2-rospkg diff --git a/pcr/python2-sendfile/PKGBUILD b/pcr/python2-sendfile/PKGBUILD index 3de2d5a48..8da81bcbf 100644 --- a/pcr/python2-sendfile/PKGBUILD +++ b/pcr/python2-sendfile/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Josh Chase +# Contributor (Arch): Josh Chase # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-sendfile diff --git a/pcr/python2-setuptools/PKGBUILD b/pcr/python2-setuptools/PKGBUILD index 85f0caf32..c2efc0ead 100644 --- a/pcr/python2-setuptools/PKGBUILD +++ b/pcr/python2-setuptools/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Jaroslav Lichtblau -# Contributor: cwchen -# Contributor: Florian Friesdorf -# Contributor: simo -# Contributor: William Rea -# Contributor: Todd Maynard +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): cwchen +# Contributor (Arch): Florian Friesdorf +# Contributor (Arch): simo +# Contributor (Arch): William Rea +# Contributor (Arch): Todd Maynard pkgname=python2-setuptools _pkgname=setuptools diff --git a/pcr/python2-ssh/PKGBUILD b/pcr/python2-ssh/PKGBUILD index 84005f0ac..bc4378393 100644 --- a/pcr/python2-ssh/PKGBUILD +++ b/pcr/python2-ssh/PKGBUILD @@ -1,5 +1,3 @@ -# Contributor: Your Name - pkgname=python2-ssh pkgver=1.8.0 pkgrel=1 diff --git a/pcr/python2-suds/PKGBUILD b/pcr/python2-suds/PKGBUILD index a45009a2b..cfba6eed2 100644 --- a/pcr/python2-suds/PKGBUILD +++ b/pcr/python2-suds/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jonathan Liu +# Contributor (Arch): Jonathan Liu # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=python2-suds diff --git a/pcr/python2-webob/PKGBUILD b/pcr/python2-webob/PKGBUILD index 8dd0df386..328cf35f0 100644 --- a/pcr/python2-webob/PKGBUILD +++ b/pcr/python2-webob/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Aaron DeVore -# Contributor: Cilyan Olowen +# Contributor (Arch): Aaron DeVore +# Contributor (Arch): Cilyan Olowen # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname='python2-webob' diff --git a/pcr/pyutil/PKGBUILD b/pcr/pyutil/PKGBUILD index 7c3ca9f60..8bc264382 100644 --- a/pcr/pyutil/PKGBUILD +++ b/pcr/pyutil/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Nicolas Pouillard -# Contributor: Peter Simons +# Maintainer (Arch): Nicolas Pouillard +# Contributor (Arch): Peter Simons pkgname=pyutil pkgver=1.9.4 pkgrel=2 diff --git a/pcr/pyzenity/PKGBUILD b/pcr/pyzenity/PKGBUILD index 364cb56a1..2db441efa 100644 --- a/pcr/pyzenity/PKGBUILD +++ b/pcr/pyzenity/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: lang2 -# Contributor: sylvain alborini +# Contributor (Arch): lang2 +# Contributor (Arch): sylvain alborini # Maintainer : Parabola Aurélien DESBRIÈRES pkgname=pyzenity diff --git a/pcr/qgis/PKGBUILD b/pcr/qgis/PKGBUILD index a5c6b48eb..fc87cbf12 100644 --- a/pcr/qgis/PKGBUILD +++ b/pcr/qgis/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Lantald < lantald at gmx.com -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -# Contributor: Gerardo Exequiel Pozzi -# Contributor: Eric Forgeot < http://esclinux.tk > +# Maintainer (Arch): Lantald < lantald at gmx.com +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor (Arch): Gerardo Exequiel Pozzi +# Contributor (Arch): Eric Forgeot < http://esclinux.tk > pkgname=qgis pkgver=1.8.0 diff --git a/pcr/qtkeychain/PKGBUILD b/pcr/qtkeychain/PKGBUILD index 152971751..8cce24b13 100644 --- a/pcr/qtkeychain/PKGBUILD +++ b/pcr/qtkeychain/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Kuba Serafinowski # Maintainer: Jorge Araya Navarro -# Contributor: Teo Mrnjavac +# Contributor (Arch): Teo Mrnjavac # https://github.com/zizzfizzix/pkgbuilds _buildtype="Release" diff --git a/pcr/qtoctave/PKGBUILD b/pcr/qtoctave/PKGBUILD index d84dfa3a2..ed9b3fa7c 100644 --- a/pcr/qtoctave/PKGBUILD +++ b/pcr/qtoctave/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Michael Schubert -# Contributor: Ronald van Haren -# Contributor: Stefan Husmann +# Maintainer (Arch): Michael Schubert +# Contributor (Arch): Ronald van Haren +# Contributor (Arch): Stefan Husmann pkgname=qtoctave pkgver=0.10.1 diff --git a/pcr/quack/PKGBUILD b/pcr/quack/PKGBUILD index 18aa1025d..a55291463 100644 --- a/pcr/quack/PKGBUILD +++ b/pcr/quack/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Geoffrey Teale -# Contributor: Stefan Husmann +# Contributor (Arch): Geoffrey Teale +# Contributor (Arch): Stefan Husmann # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=quack diff --git a/pcr/quackle/PKGBUILD b/pcr/quackle/PKGBUILD index 02f5ac568..9f6fc79e5 100644 --- a/pcr/quackle/PKGBUILD +++ b/pcr/quackle/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Guillaume ALAUX +# Maintainer (Arch): Guillaume ALAUX pkgname=quackle pkgver=0.97 pkgrel=2 diff --git a/pcr/quvi-current/PKGBUILD b/pcr/quvi-current/PKGBUILD index 8acfc507f..c421f9dc0 100644 --- a/pcr/quvi-current/PKGBUILD +++ b/pcr/quvi-current/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $ -# Maintainer: Lukas Fleischer -# Contributor: joyfulgirl@archlinux.us +# Maintainer (Arch): Lukas Fleischer +# Contributor (Arch): joyfulgirl@archlinux.us pkgname=quvi-current _pkgname=quvi diff --git a/pcr/radicale/PKGBUILD b/pcr/radicale/PKGBUILD index 879cda8d4..5244a63ab 100644 --- a/pcr/radicale/PKGBUILD +++ b/pcr/radicale/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Guillaume Bouchard +# Maintainer (Arch): Guillaume Bouchard pkgname=radicale pkgver=0.8 pkgrel=1 diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD index 437030401..b3a3cd142 100644 --- a/pcr/radiusclient-ng/PKGBUILD +++ b/pcr/radiusclient-ng/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jonathan Liu +# Contributor (Arch): Jonathan Liu pkgname=radiusclient-ng pkgver=0.5.6 pkgrel=1 diff --git a/pcr/re2-hg/PKGBUILD b/pcr/re2-hg/PKGBUILD index 915af840b..9af6e6827 100644 --- a/pcr/re2-hg/PKGBUILD +++ b/pcr/re2-hg/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=re2-hg diff --git a/pcr/recutils/PKGBUILD b/pcr/recutils/PKGBUILD index ddf47243a..4a6952bbd 100644 --- a/pcr/recutils/PKGBUILD +++ b/pcr/recutils/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Max Meyer -# Contributor: Sven Wick +# Maintainer (Arch): Max Meyer +# Contributor (Arch): Sven Wick # # Please fork and send me a pull request for changes to package build file(s) # Url: https://github.com/maxmeyer/archlinux-recutils diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD index bc48fbe8d..eedfa62f9 100644 --- a/pcr/renpy/PKGBUILD +++ b/pcr/renpy/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: AlexanderR -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): AlexanderR +# Maintainer: Márcio Silva pkgname=renpy pkgver=6.16.2 diff --git a/pcr/retroshare/PKGBUILD b/pcr/retroshare/PKGBUILD index f52c614c5..c314bd08f 100644 --- a/pcr/retroshare/PKGBUILD +++ b/pcr/retroshare/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: stqn -# Contributor: JHeaton -# Contributor: Tristero -# Contributor: funkyou +# Maintainer (Arch): stqn +# Contributor (Arch): JHeaton +# Contributor (Arch): Tristero +# Contributor (Arch): funkyou # Set this to true to build and install retroshare-nogui _build_nogui=true diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD index fc14b4a76..38ca25b7d 100644 --- a/pcr/rfc5766-turn-server/PKGBUILD +++ b/pcr/rfc5766-turn-server/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: orphan +# Maintainer (Arch): orphan # Contributor: Nicolás Reynolds # Contributor: Luke Shumaker # Contributor: Michał Masłowski diff --git a/pcr/rosinstall/PKGBUILD b/pcr/rosinstall/PKGBUILD index 3f91dbe6c..0dcfeb95b 100644 --- a/pcr/rosinstall/PKGBUILD +++ b/pcr/rosinstall/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Georg Bremer +# Contributor (Arch): Georg Bremer # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgdesc='Tool to download/boostrap the ROS stack' diff --git a/pcr/roundcube-carddav/PKGBUILD b/pcr/roundcube-carddav/PKGBUILD index 840834106..ad50df248 100644 --- a/pcr/roundcube-carddav/PKGBUILD +++ b/pcr/roundcube-carddav/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Contributor: tang francescoallara.it +# Contributor (Arch): tang francescoallara.it # Maintainer : Parabola Aurélien Desbrières pkgname=roundcube-carddav diff --git a/pcr/roundcube-rcguard-plugin-git/PKGBUILD b/pcr/roundcube-rcguard-plugin-git/PKGBUILD index d19298af7..8132daf92 100644 --- a/pcr/roundcube-rcguard-plugin-git/PKGBUILD +++ b/pcr/roundcube-rcguard-plugin-git/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: achterin +# Contributor (Arch): achterin # Maintainer : Parabola Aurélien Desbrières pkgname=roundcube-rcguard-plugin-git diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD index 569df2b33..4d3d04d77 100644 --- a/pcr/rstudio-desktop/PKGBUILD +++ b/pcr/rstudio-desktop/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: TDY -# Contributor: Ben Ward +# Maintainer (Arch): TDY +# Contributor (Arch): Ben Ward pkgname=rstudio-desktop pkgver=0.97.332 diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD index 52e4d36e4..8243f2c85 100644 --- a/pcr/ruby-bundler/PKGBUILD +++ b/pcr/ruby-bundler/PKGBUILD @@ -1,7 +1,7 @@ # Generated by gem2arch (https://github.com/anatol/gem2arch) -# Maintainer: Anatol Pomozov -# Contributor: Alexsandr Pavlov -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Anatol Pomozov +# Contributor (Arch): Alexsandr Pavlov +# Maintainer: Márcio Silva _gemname=bundler pkgname=ruby-$_gemname diff --git a/pcr/ruby-haml/PKGBUILD b/pcr/ruby-haml/PKGBUILD index 37290484a..78ee79783 100644 --- a/pcr/ruby-haml/PKGBUILD +++ b/pcr/ruby-haml/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Renzo Carbonara +# Contributor (Arch): Renzo Carbonara # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ruby-haml diff --git a/pcr/ruby-headers/PKGBUILD b/pcr/ruby-headers/PKGBUILD index 7b20fc288..6c80b0147 100644 --- a/pcr/ruby-headers/PKGBUILD +++ b/pcr/ruby-headers/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: fauno -# Contributor: Hilton Medeiros +# Contributor (Arch): Hilton Medeiros pkgname=ruby-headers _pkgname=ruby diff --git a/pcr/ruby-hiera-json/PKGBUILD b/pcr/ruby-hiera-json/PKGBUILD index 4d80244c8..481fd3f0c 100644 --- a/pcr/ruby-hiera-json/PKGBUILD +++ b/pcr/ruby-hiera-json/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jochen Schalanda +# Contributor (Arch): Jochen Schalanda # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres _gemname=hiera-json diff --git a/pcr/ruby-hiera/PKGBUILD b/pcr/ruby-hiera/PKGBUILD index c4d51fe44..e6ad28c46 100644 --- a/pcr/ruby-hiera/PKGBUILD +++ b/pcr/ruby-hiera/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jochen Schalanda +# Contributor (Arch): Jochen Schalanda # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres _gemname=hiera diff --git a/pcr/ruby-libnotify/PKGBUILD b/pcr/ruby-libnotify/PKGBUILD index f38e10d2d..25864f2b2 100644 --- a/pcr/ruby-libnotify/PKGBUILD +++ b/pcr/ruby-libnotify/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Luca Russo -# Contributor: Sigitas Mazaliauskas -# Contributor: Andreas W. Hauser +# Contributor (Arch): Luca Russo +# Contributor (Arch): Sigitas Mazaliauskas +# Contributor (Arch): Andreas W. Hauser # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ruby-libnotify diff --git a/pcr/ruby-mustache/PKGBUILD b/pcr/ruby-mustache/PKGBUILD index ddb5215d3..33ffedf73 100644 --- a/pcr/ruby-mustache/PKGBUILD +++ b/pcr/ruby-mustache/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: David Campbell +# Maintainer (Arch): David Campbell pkgname=ruby-mustache pkgver=0.99.4 pkgrel=3 diff --git a/pcr/ruby-shadow/PKGBUILD b/pcr/ruby-shadow/PKGBUILD index 155835a3f..d77715866 100644 --- a/pcr/ruby-shadow/PKGBUILD +++ b/pcr/ruby-shadow/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Thomas S Hatch +# Contributor (Arch): Thomas S Hatch # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ruby-shadow diff --git a/pcr/ruby-yard/PKGBUILD b/pcr/ruby-yard/PKGBUILD index a686f937d..56a612cbd 100644 --- a/pcr/ruby-yard/PKGBUILD +++ b/pcr/ruby-yard/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Matt Harrison -# Contributor: Renzo Carbonara +# Maintainer (Arch): Matt Harrison +# Contributor (Arch): Renzo Carbonara pkgname=ruby-yard _gemname=${pkgname#ruby-} diff --git a/pcr/ruby1-bundler/PKGBUILD b/pcr/ruby1-bundler/PKGBUILD index b7a42287b..1f965a1ba 100644 --- a/pcr/ruby1-bundler/PKGBUILD +++ b/pcr/ruby1-bundler/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Alexsandr Pavlov -# Maintainer (Parabola): Márcio Silva +# Contributor (Arch): Alexsandr Pavlov +# Maintainer: Márcio Silva _pkgname=bundler pkgname=ruby1-$_pkgname diff --git a/pcr/ruby1/PKGBUILD b/pcr/ruby1/PKGBUILD index 4a441bc1c..d85704af6 100644 --- a/pcr/ruby1/PKGBUILD +++ b/pcr/ruby1/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Thomas Dziedzic -# Contributor: Allan McRae -# Contributor: John Proctor -# Contributor: Jeramy Rutley +# Maintainer (Arch): Thomas Dziedzic +# Contributor (Arch): Allan McRae +# Contributor (Arch): John Proctor +# Contributor (Arch): Jeramy Rutley _pkgname=ruby pkgname=("${_pkgname}1" "${_pkgname}1-docs") diff --git a/pcr/samba4/PKGBUILD b/pcr/samba4/PKGBUILD index 09c55781d..c2b8c88fa 100644 --- a/pcr/samba4/PKGBUILD +++ b/pcr/samba4/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Michael Hansen -# Contributor: Marco A Rojas -# Contributor: Netanel Shine -# Contributor: ngoonee -# Contributor: Adam Russell -# Contributor: Dhananjay Sathe +# Maintainer (Arch): Michael Hansen +# Contributor (Arch): Marco A Rojas +# Contributor (Arch): Netanel Shine +# Contributor (Arch): ngoonee +# Contributor (Arch): Adam Russell +# Contributor (Arch): Dhananjay Sathe pkgname=samba4 pkgver=4.0.0rc5 pkgrel=1 diff --git a/pcr/setuptools_darcs/PKGBUILD b/pcr/setuptools_darcs/PKGBUILD index 285214db8..5db2428d9 100644 --- a/pcr/setuptools_darcs/PKGBUILD +++ b/pcr/setuptools_darcs/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Peter Simons -# Contributor: Nicolas Pouillard +# Contributor (Arch): Peter Simons +# Contributor (Arch): Nicolas Pouillard pkgname=setuptools_darcs pkgver=1.2.11 pkgrel=3.1 diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD index 94f89f7e7..95f2b9b51 100644 --- a/pcr/sfml-git/PKGBUILD +++ b/pcr/sfml-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Ondrej Martinak +# Maintainer (Arch): Ondrej Martinak # Contributor: Jorge Araya Navarro pkgname=sfml-git diff --git a/pcr/sic/PKGBUILD b/pcr/sic/PKGBUILD index b006f95b5..3f5085f31 100644 --- a/pcr/sic/PKGBUILD +++ b/pcr/sic/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Dag Odenhall -# Contributor: Giorgio Lando +# Maintainer (Arch): Thomas Dziedzic < gostrc at gmail > +# Contributor (Arch): Dag Odenhall +# Contributor (Arch): Giorgio Lando pkgname=sic pkgver=1.2 diff --git a/pcr/sigil/PKGBUILD b/pcr/sigil/PKGBUILD index 0d5802ac1..c5737e7d3 100644 --- a/pcr/sigil/PKGBUILD +++ b/pcr/sigil/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 59836 2011-11-30 22:56:23Z giovanni $ -# Maintainer: Giovanni Scafora -# Contributor: Larry Hajali +# Maintainer (Arch): Giovanni Scafora +# Contributor (Arch): Larry Hajali # Contributor: Jorge Araya Navarro pkgname=sigil diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD index fbaf88141..bc5de1a76 100644 --- a/pcr/sipwitch/PKGBUILD +++ b/pcr/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Dan Serban -# Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Dan Serban +# Contributors (Arch): David Zaragoza, Andrea Scarpino +# Maintainer: André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/pcr/skanlite/PKGBUILD b/pcr/skanlite/PKGBUILD index b0fa953e5..61677d0d5 100644 --- a/pcr/skanlite/PKGBUILD +++ b/pcr/skanlite/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: birdflesh -# Contributor: Andrea Scarpino -# Contributor: Pierre Schmitz +# Maintainer (Arch): birdflesh +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Pierre Schmitz pkgname=skanlite pkgver=1.0 diff --git a/pcr/sltv/PKGBUILD b/pcr/sltv/PKGBUILD index 0669c5110..74ebb6c26 100644 --- a/pcr/sltv/PKGBUILD +++ b/pcr/sltv/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: farid abdelnour -# Contributor: SpepS -# Contributor: Wille Marcel +# Maintainer (Arch): farid abdelnour +# Contributor (Arch): SpepS +# Contributor (Arch): Wille Marcel pkgname=sltv pkgver=0.91 diff --git a/pcr/sltv/PKGBUILD.new b/pcr/sltv/PKGBUILD.new index 9a3f6b6a8..2a8344c61 100644 --- a/pcr/sltv/PKGBUILD.new +++ b/pcr/sltv/PKGBUILD.new @@ -1,6 +1,6 @@ -# Maintainer: farid abdelnour -# Contributor: SpepS -# Contributor: Wille Marcel +# Maintainer (Arch): farid abdelnour +# Contributor (Arch): SpepS +# Contributor (Arch): Wille Marcel pkgname=sltv pkgver=0.92 diff --git a/pcr/snort/PKGBUILD b/pcr/snort/PKGBUILD index 2439a1c73..a92d8cb43 100644 --- a/pcr/snort/PKGBUILD +++ b/pcr/snort/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $ -# Contributor: Lukas Fleischer -# Contributor: Hugo Doria -# Contributor: Kessia 'even' Pinheiro -# Contributor: dorphell -# Contributor: Gregor Ibic +# Contributor (Arch): Lukas Fleischer +# Contributor (Arch): Hugo Doria +# Contributor (Arch): Kessia 'even' Pinheiro +# Contributor (Arch): dorphell +# Contributor (Arch): Gregor Ibic # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=snort diff --git a/pcr/sobby/PKGBUILD b/pcr/sobby/PKGBUILD index 892d88cee..646386ba9 100644 --- a/pcr/sobby/PKGBUILD +++ b/pcr/sobby/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Thomas Jost +# Maintainer (Arch): Thomas Jost pkgname=sobby pkgver=0.4.8 pkgrel=2 diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD index f3fbcecaf..dc88914ec 100644 --- a/pcr/softhsm/PKGBUILD +++ b/pcr/softhsm/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Javier Torres +# Maintainer (Arch): Javier Torres pkgname=softhsm pkgver=1.3.4 diff --git a/pcr/spatialindex/PKGBUILD b/pcr/spatialindex/PKGBUILD index ac2e1122e..866addfdb 100644 --- a/pcr/spatialindex/PKGBUILD +++ b/pcr/spatialindex/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Lantald +# Maintainer (Arch): Lantald pkgname=spatialindex pkgver=1.8.0 pkgrel=1 diff --git a/pcr/spectrum/PKGBUILD b/pcr/spectrum/PKGBUILD index 250840fb7..97efd0e0c 100644 --- a/pcr/spectrum/PKGBUILD +++ b/pcr/spectrum/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Clément Démoulins -# Contributor: Sonny Piers -# Contributor: Tim Besard -# Contributor: miniature +# Maintainer (Arch): Clément Démoulins +# Contributor (Arch): Sonny Piers +# Contributor (Arch): Tim Besard +# Contributor (Arch): miniature pkgname=spectrum pkgver=1.4.8 diff --git a/pcr/spice-gtk3/PKGBUILD b/pcr/spice-gtk3/PKGBUILD index 903b9b56b..5cc7fa9f0 100644 --- a/pcr/spice-gtk3/PKGBUILD +++ b/pcr/spice-gtk3/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Stefano Facchini -# Contributor: Jonathan Lestrelin +# Contributor (Arch): Stefano Facchini +# Contributor (Arch): Jonathan Lestrelin # Derived from the spice-gtk PKGBUILD by -# Contributor: Lucio Zara +# Contributor (Arch): Lucio Zara # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=spice-gtk3 diff --git a/pcr/spice/PKGBUILD b/pcr/spice/PKGBUILD index d54f1657d..df4a39a04 100644 --- a/pcr/spice/PKGBUILD +++ b/pcr/spice/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Lucio Zara -# Contributor: Jameson Pugh +# Contributor (Arch): Lucio Zara +# Contributor (Arch): Jameson Pugh # Maintainer : Parabola GNU / Linux-libre pkgname=spice diff --git a/pcr/spnavcfg/PKGBUILD b/pcr/spnavcfg/PKGBUILD index c1fea3d17..92186fd64 100644 --- a/pcr/spnavcfg/PKGBUILD +++ b/pcr/spnavcfg/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jan Hambrecht -# Maintainer (Parabola): Márcio Silva +# Contributor (Arch): Jan Hambrecht +# Maintainer: Márcio Silva pkgname=spnavcfg pkgver=0.2.1 diff --git a/pcr/squirm/PKGBUILD b/pcr/squirm/PKGBUILD index a1249c39d..527d4a5b9 100644 --- a/pcr/squirm/PKGBUILD +++ b/pcr/squirm/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Spider.007 -# Contributor: Spider.007 +# Maintainer (Arch): Spider.007 +# Contributor (Arch): Spider.007 pkgname=squirm pkgver=1.26 pkgrel=2 diff --git a/pcr/startupmanager/PKGBUILD b/pcr/startupmanager/PKGBUILD index 4b33f36a9..1a4454d84 100644 --- a/pcr/startupmanager/PKGBUILD +++ b/pcr/startupmanager/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Alexander Rødseth -# Contributor: Chris Giles -# Contributor: fernando < arch at liquuid dot net> -# Contributor: Juan Pablo González Tognarelli +# Contributor (Arch): Alexander Rødseth +# Contributor (Arch): Chris Giles +# Contributor (Arch): fernando < arch at liquuid dot net> +# Contributor (Arch): Juan Pablo González Tognarelli # Maintainer : Parabola GNU / Linux-libre Aurlien Desbrires pkgname=startupmanager diff --git a/pcr/steadyflow/PKGBUILD b/pcr/steadyflow/PKGBUILD index a9381448e..c7eb85b35 100644 --- a/pcr/steadyflow/PKGBUILD +++ b/pcr/steadyflow/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: M0Rf30 -# Contributor: Dan Serban -# Contributor: zbito -# Contributor: danilo -# Contributor: Jason Begley -# Contributor: Ray Kohler -# Contributor: Daniel Riedemann -# Contributor: 458italia -# Maintainer: dkorzhevin +# Contributor (Arch): nikicat +# Contributor (Arch): danilo +# Contributor (Arch): Jason Begley +# Contributor (Arch): Ray Kohler +# Contributor (Arch): Daniel Riedemann +# Contributor (Arch): 458italia +# Maintainer (Arch): dkorzhevin pkgname=strongswan pkgver=5.1.0 diff --git a/pcr/stumpwm-git/PKGBUILD b/pcr/stumpwm-git/PKGBUILD index 986a8f740..3b717a119 100644 --- a/pcr/stumpwm-git/PKGBUILD +++ b/pcr/stumpwm-git/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: M Rawash -# Contributor: olvar -# Contributor: Andrew Antle -# Contributor: joyfulgirl -# Contributor: Jonathan Friedman +# Contributor (Arch): M Rawash +# Contributor (Arch): olvar +# Contributor (Arch): Andrew Antle +# Contributor (Arch): joyfulgirl +# Contributor (Arch): Jonathan Friedman # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=stumpwm-git diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD index fd22bea59..3e2f10481 100644 --- a/pcr/supermodel/PKGBUILD +++ b/pcr/supermodel/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Anton Shestakov +# Maintainer (Arch): Anton Shestakov pkgname=supermodel pkgver=0.2a diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD index 4cb83afd2..4e1b29797 100644 --- a/pcr/swig1/PKGBUILD +++ b/pcr/swig1/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Hilton Medeiros -# Contributor: Jason Chu -# Contributor: Tom Newsom +# Contributor (Arch): Hilton Medeiros +# Contributor (Arch): Jason Chu +# Contributor (Arch): Tom Newsom # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=swig1 diff --git a/pcr/sword-svn/PKGBUILD b/pcr/sword-svn/PKGBUILD index 8e29cdab8..42d09c3bc 100644 --- a/pcr/sword-svn/PKGBUILD +++ b/pcr/sword-svn/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Stefan Husmann +# Maintainer (Arch): Stefan Husmann pkgname=sword-svn pkgver=2793 pkgrel=1 diff --git a/pcr/sword/PKGBUILD b/pcr/sword/PKGBUILD index 78ab4e646..013b50972 100644 --- a/pcr/sword/PKGBUILD +++ b/pcr/sword/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: -# Contributor: Alexander Rødseth -# Contributor: Andrea Scarpino -# Contributor: Stefan Husmann -# Contributor: TripleE -# Contributor: Dominic Tubach +# Maintainer (Arch): +# Contributor (Arch): Alexander Rødseth +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Stefan Husmann +# Contributor (Arch): TripleE +# Contributor (Arch): Dominic Tubach pkgname=sword pkgver=1.6.2 diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD index 8ace70679..e47b3b05e 100644 --- a/pcr/tahoe-lafs/PKGBUILD +++ b/pcr/tahoe-lafs/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Peter Simons -# Contributor: Nicolas Pouillard +# Contributor (Arch): Peter Simons +# Contributor (Arch): Nicolas Pouillard pkgname=tahoe-lafs pkgver=1.10.0 pkgrel=1 diff --git a/pcr/ted/PKGBUILD b/pcr/ted/PKGBUILD index aa085dc62..f78ce37b5 100644 --- a/pcr/ted/PKGBUILD +++ b/pcr/ted/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: willemw -# Contributor: shirokuro -# Contributor: sergej +# Contributor (Arch): willemw +# Contributor (Arch): shirokuro +# Contributor (Arch): sergej # Maintainer : Parabola Aurélien DESBRIÈRES pkgname=ted diff --git a/pcr/textext/PKGBUILD b/pcr/textext/PKGBUILD index 8a1897dc4..f83f9ceea 100644 --- a/pcr/textext/PKGBUILD +++ b/pcr/textext/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Joel Schaerer -# Maintainer: Stefan Husmann +# Contributor (Arch): Joel Schaerer +# Maintainer (Arch): Stefan Husmann pkgname=textext pkgver=0.4.4 pkgrel=3 diff --git a/pcr/theide/PKGBUILD b/pcr/theide/PKGBUILD index 26dc34f0f..215b4493b 100644 --- a/pcr/theide/PKGBUILD +++ b/pcr/theide/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jan Dolinar +# Contributor (Arch): Jan Dolinar # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=theide diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD index 18a97754f..c8bc49e0b 100644 --- a/pcr/thinkfan/PKGBUILD +++ b/pcr/thinkfan/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: nblock -# Contributor: Frederik Alkærsig (FALKER) +# Maintainer (Arch): nblock +# Contributor (Arch): Frederik Alkærsig (FALKER) pkgname=thinkfan pkgver=0.8.1 diff --git a/pcr/timekpr/PKGBUILD b/pcr/timekpr/PKGBUILD index 4d2af3bfd..79934358c 100644 --- a/pcr/timekpr/PKGBUILD +++ b/pcr/timekpr/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: SanskritFritz (gmail) +# Contributor (Arch): SanskritFritz (gmail) pkgname=timekpr pkgver=0.3.2 diff --git a/pcr/tokyotyrant/PKGBUILD b/pcr/tokyotyrant/PKGBUILD index ea5c94e30..e3a993ff4 100644 --- a/pcr/tokyotyrant/PKGBUILD +++ b/pcr/tokyotyrant/PKGBUILD @@ -1,5 +1,5 @@ -# # Maintainer: Angel Velasquez -# Contributor: Paul Sadauskas +# # Maintainer (Arch): Angel Velasquez +# Contributor (Arch): Paul Sadauskas pkgname=tokyotyrant pkgver=1.1.41 diff --git a/pcr/toluapp/PKGBUILD b/pcr/toluapp/PKGBUILD index fa8c841c6..faf09878a 100644 --- a/pcr/toluapp/PKGBUILD +++ b/pcr/toluapp/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Stéphane Gaudreault +# Contributor (Arch): Stéphane Gaudreault # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=toluapp diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD index 1217fa8a9..23aba4e02 100644 --- a/pcr/tomb/PKGBUILD +++ b/pcr/tomb/PKGBUILD @@ -1,8 +1,8 @@ ## PKGBUILD [bash] -# Maintainer: nignux -# Maintainer (Parabola): fauno -# Contributor: BoySka -# Contributor: Rich Li +# Maintainer (Arch): nignux +# Maintainer: fauno +# Contributor (Arch): BoySka +# Contributor (Arch): Rich Li pkgname=(tomb tomb-kdf) pkgver=1.5.2 diff --git a/pcr/tryton/PKGBUILD b/pcr/tryton/PKGBUILD index bca68fbf0..7d8838206 100644 --- a/pcr/tryton/PKGBUILD +++ b/pcr/tryton/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Contributor: Florian Walch +# Maintainer (Arch): Robin Baumgartner +# Contributor (Arch): Florian Walch pkgname=tryton pkgver=3.0.1 _pkgdir=3.0 diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD index d19d696bb..068cde79a 100644 --- a/pcr/trytond-account-invoice/PKGBUILD +++ b/pcr/trytond-account-invoice/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-account-invoice _pkgname=trytond_account_invoice pkgver=3.0.1 diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD index 07ba82b70..0096835cc 100644 --- a/pcr/trytond-account-product/PKGBUILD +++ b/pcr/trytond-account-product/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-account-product _pkgname=trytond_account_product pkgver=3.0.0 diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD index 65389ad40..224121457 100644 --- a/pcr/trytond-account/PKGBUILD +++ b/pcr/trytond-account/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-account _pkgname=trytond_account pkgver=3.0.1 diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD index 034b3aac8..23005de3e 100644 --- a/pcr/trytond-calendar/PKGBUILD +++ b/pcr/trytond-calendar/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-calendar _pkgname=trytond_calendar pkgver=3.0.2 diff --git a/pcr/trytond-carrier/PKGBUILD b/pcr/trytond-carrier/PKGBUILD index c4827cac0..cbf83d5f3 100644 --- a/pcr/trytond-carrier/PKGBUILD +++ b/pcr/trytond-carrier/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-carrier _pkgname=trytond_carrier pkgver=3.0.0 diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD index a0faaaaf1..c323b2d7b 100644 --- a/pcr/trytond-company/PKGBUILD +++ b/pcr/trytond-company/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-company _pkgname=trytond_company pkgver=3.0.0 diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD index 521738879..3be276a66 100644 --- a/pcr/trytond-country/PKGBUILD +++ b/pcr/trytond-country/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-country _pkgname=trytond_country pkgver=3.0.0 diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD index caa38fc4a..ee6b98b82 100644 --- a/pcr/trytond-currency/PKGBUILD +++ b/pcr/trytond-currency/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-currency _pkgname=trytond_currency pkgver=3.0.0 diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD index 91ffd4e54..93996df1d 100644 --- a/pcr/trytond-party/PKGBUILD +++ b/pcr/trytond-party/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-party _pkgname=trytond_party pkgver=3.0.0 diff --git a/pcr/trytond-product-price-list/PKGBUILD b/pcr/trytond-product-price-list/PKGBUILD index bc55f3e7b..f5b2cc0c1 100644 --- a/pcr/trytond-product-price-list/PKGBUILD +++ b/pcr/trytond-product-price-list/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-product-price-list _pkgname=trytond_product_price_list pkgver=3.0.0 diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD index 03c58c676..cdf15f347 100644 --- a/pcr/trytond-product/PKGBUILD +++ b/pcr/trytond-product/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-product _pkgname=trytond_product pkgver=3.0.0 diff --git a/pcr/trytond-purchase/PKGBUILD b/pcr/trytond-purchase/PKGBUILD index 5b0042cb0..a0821d50c 100644 --- a/pcr/trytond-purchase/PKGBUILD +++ b/pcr/trytond-purchase/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-purchase _pkgname=trytond_purchase pkgver=3.0.0 diff --git a/pcr/trytond-sale-invoice-grouping/PKGBUILD b/pcr/trytond-sale-invoice-grouping/PKGBUILD index 8606d43e2..bc5710470 100644 --- a/pcr/trytond-sale-invoice-grouping/PKGBUILD +++ b/pcr/trytond-sale-invoice-grouping/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-invoice-grouping _pkgname=trytond_sale_invoice_grouping pkgver=3.0.1 diff --git a/pcr/trytond-sale-opportunity/PKGBUILD b/pcr/trytond-sale-opportunity/PKGBUILD index c2702eb4b..30c78743c 100644 --- a/pcr/trytond-sale-opportunity/PKGBUILD +++ b/pcr/trytond-sale-opportunity/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-opportunity _pkgname=trytond_sale_opportunity pkgver=3.0.0 diff --git a/pcr/trytond-sale-price-list/PKGBUILD b/pcr/trytond-sale-price-list/PKGBUILD index f0d501e9a..891a17694 100644 --- a/pcr/trytond-sale-price-list/PKGBUILD +++ b/pcr/trytond-sale-price-list/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-price-list _pkgname=trytond_sale_price_list pkgver=3.0.0 diff --git a/pcr/trytond-sale-shipment-cost/PKGBUILD b/pcr/trytond-sale-shipment-cost/PKGBUILD index 723ebfc11..76380b7fb 100644 --- a/pcr/trytond-sale-shipment-cost/PKGBUILD +++ b/pcr/trytond-sale-shipment-cost/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-shipment-cost _pkgname=trytond_sale_shipment_cost pkgver=3.0.0 diff --git a/pcr/trytond-sale-supply-drop-shipment/PKGBUILD b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD index 2c8acf5e5..b7305e577 100644 --- a/pcr/trytond-sale-supply-drop-shipment/PKGBUILD +++ b/pcr/trytond-sale-supply-drop-shipment/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-supply-drop-shipment _pkgname=trytond_sale_supply_drop_shipment pkgver=3.0.0 diff --git a/pcr/trytond-sale-supply/PKGBUILD b/pcr/trytond-sale-supply/PKGBUILD index 031c2ca85..3d2d2fa97 100644 --- a/pcr/trytond-sale-supply/PKGBUILD +++ b/pcr/trytond-sale-supply/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale-supply _pkgname=trytond_sale_supply pkgver=3.0.0 diff --git a/pcr/trytond-sale/PKGBUILD b/pcr/trytond-sale/PKGBUILD index f6ac99044..dee18aad0 100644 --- a/pcr/trytond-sale/PKGBUILD +++ b/pcr/trytond-sale/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-sale _pkgname=trytond_sale pkgver=3.0.0 diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD index 0bad5fa9c..4440a44b0 100644 --- a/pcr/trytond-stock-lot/PKGBUILD +++ b/pcr/trytond-stock-lot/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-stock-lot _pkgname=trytond_stock_lot pkgver=3.0.0 diff --git a/pcr/trytond-stock-supply/PKGBUILD b/pcr/trytond-stock-supply/PKGBUILD index 6f65cfc8d..633bb342a 100644 --- a/pcr/trytond-stock-supply/PKGBUILD +++ b/pcr/trytond-stock-supply/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Robin Baumgartner +# Maintainer (Arch): Robin Baumgartner pkgname=trytond-stock-supply _pkgname=trytond_stock_supply pkgver=3.0.0 diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD index 44883e1ce..2fc270be9 100644 --- a/pcr/trytond-stock/PKGBUILD +++ b/pcr/trytond-stock/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond-stock _pkgname=trytond_stock pkgver=3.0.1 diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index 35ee42068..8fd0450d3 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Florian Walch -# Maintainer: Robin Baumgartner -# Maintainer (Parabola): André Silva +# Contributor (Arch): Florian Walch +# Maintainer (Arch): Robin Baumgartner +# Maintainer: André Silva pkgname=trytond pkgver=3.0.0 _pkgdir=3.0 diff --git a/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD index 8b0169d83..e6e92dbc0 100644 --- a/pcr/ttf-asana-math/PKGBUILD +++ b/pcr/ttf-asana-math/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: GordonGR -# Maintainer (Parabola): Alon Ivtsan +# Maintainer (Arch): GordonGR +# Maintainer: Alon Ivtsan # taken from https://aur.archlinux.org/packages/ttf-asana-math/ pkgname=ttf-asana-math diff --git a/pcr/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD index 3bbe41397..59249afbb 100644 --- a/pcr/ttf-beteckna/PKGBUILD +++ b/pcr/ttf-beteckna/PKGBUILD @@ -1,5 +1,5 @@ # From https://aur.archlinux.org/packages.php?ID=22483 -# Maintainer: TDY +# Maintainer (Arch): TDY pkgname=ttf-beteckna pkgver=0.4 diff --git a/pcr/ttf-font-awesome/PKGBUILD b/pcr/ttf-font-awesome/PKGBUILD index abb63b8a6..37254c735 100644 --- a/pcr/ttf-font-awesome/PKGBUILD +++ b/pcr/ttf-font-awesome/PKGBUILD @@ -1,4 +1,4 @@ -#Contributer: UNKNOWN o_O +#Contributer (Arch): UNKNOWN o_O #Maintainer : Parabola Aurélien DESBRIÈRES pkgname=ttf-font-awesome diff --git a/pcr/ttf-roboto/PKGBUILD b/pcr/ttf-roboto/PKGBUILD index 9085985d7..5ef7db5a2 100644 --- a/pcr/ttf-roboto/PKGBUILD +++ b/pcr/ttf-roboto/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Michael Düll PGP-Key: D6777412 - Fingerprint: C972 8B50 9411 BBE1 5CA5 9906 5103 71F3 D677 7412 +# Maintainer (Arch): Michael Düll PGP-Key: D6777412 - Fingerprint: C972 8B50 9411 BBE1 5CA5 9906 5103 71F3 D677 7412 # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ttf-roboto diff --git a/pcr/tunnels-git/PKGBUILD b/pcr/tunnels-git/PKGBUILD index bf1f0e8bc..8a61584ff 100644 --- a/pcr/tunnels-git/PKGBUILD +++ b/pcr/tunnels-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Etienne Perot +# Maintainer (Arch): Etienne Perot pkgname=tunnels-git pkgver=20130503 pkgrel=1 diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD index c4c7abdc9..24fd5e231 100644 --- a/pcr/twinkle/PKGBUILD +++ b/pcr/twinkle/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $ -# Maintainer: Sergej Pupykin -# Contributor: Jeff Mickey -# Contributor: Alexander Baldeck -# Contributor: Federico Quagliata (quaqo) -# Contributor: Alexander Rødseth +# Maintainer (Arch): Sergej Pupykin +# Contributor (Arch): Jeff Mickey +# Contributor (Arch): Alexander Baldeck +# Contributor (Arch): Federico Quagliata (quaqo) +# Contributor (Arch): Alexander Rødseth pkgname=twinkle pkgver=1.4.2 diff --git a/pcr/uftp/PKGBUILD b/pcr/uftp/PKGBUILD index 3aef7d164..397799148 100644 --- a/pcr/uftp/PKGBUILD +++ b/pcr/uftp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Markus Jochim +# Maintainer (Arch): Markus Jochim pkgname=uftp pkgver=4.0 pkgrel=1 diff --git a/pcr/ulogd2/PKGBUILD b/pcr/ulogd2/PKGBUILD index c00c462e5..68086e3f2 100644 --- a/pcr/ulogd2/PKGBUILD +++ b/pcr/ulogd2/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Andrzej Boreczko <0rion@wp.pl> +# Contributor (Arch): Andrzej Boreczko <0rion@wp.pl> # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=ulogd2 diff --git a/pcr/ums/PKGBUILD b/pcr/ums/PKGBUILD index 329120adb..35d5878c4 100644 --- a/pcr/ums/PKGBUILD +++ b/pcr/ums/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Red Squirrel +# Contributor (Arch): Red Squirrel # Maintainer : Parabola Aurélien DESBRIÈRES # Based on PMS PKGBUILD diff --git a/pcr/unittestpp/PKGBUILD b/pcr/unittestpp/PKGBUILD index 3918f98a2..5eb15be3e 100644 --- a/pcr/unittestpp/PKGBUILD +++ b/pcr/unittestpp/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Jorge Araya Navarro -# Contributor: Piotr Beling -# Contributor: Vianney le Clément +# Contributor (Arch): Piotr Beling +# Contributor (Arch): Vianney le Clément pkgname=unittestpp pkgver=1.4 pkgrel=3 diff --git a/pcr/upp-svn/PKGBUILD b/pcr/upp-svn/PKGBUILD index 1a5a50d4b..8c0042388 100644 --- a/pcr/upp-svn/PKGBUILD +++ b/pcr/upp-svn/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Jan Dolinar +# Contributor (Arch): Jan Dolinar # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=upp-svn diff --git a/pcr/vcstools/PKGBUILD b/pcr/vcstools/PKGBUILD index 3eb123ffa..f52ae270e 100644 --- a/pcr/vcstools/PKGBUILD +++ b/pcr/vcstools/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Georg Bremer +# Contributor (Arch): Georg Bremer # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=('vcstools') diff --git a/pcr/vim-ifdef/PKGBUILD b/pcr/vim-ifdef/PKGBUILD index 1fb983cb3..38b3f7853 100644 --- a/pcr/vim-ifdef/PKGBUILD +++ b/pcr/vim-ifdef/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Manuel Mendez +# Contributor (Arch): Manuel Mendez # Author: Laszlo Papp # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres diff --git a/pcr/vuurmuur/PKGBUILD b/pcr/vuurmuur/PKGBUILD index 8aed82655..b71507abf 100644 --- a/pcr/vuurmuur/PKGBUILD +++ b/pcr/vuurmuur/PKGBUILD @@ -1,9 +1,9 @@ # vim:set ts=2 sw=2 et ft=sh tw=100: expandtab -# Contributor: Piotr Rogoża -# Contributor: skydrome -# Contributor: Valere Monseur -# Contributor: Phillip Smith -# Contributor: (asper, noob +# Contributor (Arch): Piotr Rogoża +# Contributor (Arch): skydrome +# Contributor (Arch): Valere Monseur +# Contributor (Arch): Phillip Smith +# Contributor (Arch): (asper, noob # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=vuurmuur diff --git a/pcr/wallchange/PKGBUILD b/pcr/wallchange/PKGBUILD index f8465bda5..d37bb83db 100644 --- a/pcr/wallchange/PKGBUILD +++ b/pcr/wallchange/PKGBUILD @@ -1,6 +1,6 @@ # Wallchange -# Contributor: ying -# Contributor: ying +# Contributor (Arch): ying +# Contributor (Arch): ying # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=wallchange diff --git a/pcr/wikipediafs/PKGBUILD b/pcr/wikipediafs/PKGBUILD index d70dd2f6f..aed27dc6c 100644 --- a/pcr/wikipediafs/PKGBUILD +++ b/pcr/wikipediafs/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Antoine Lubineau +# Maintainer (Arch): Antoine Lubineau pkgname=wikipediafs pkgver=0.4 diff --git a/pcr/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD index c556a1b88..ce1e68b93 100644 --- a/pcr/wmii-hg/PKGBUILD +++ b/pcr/wmii-hg/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: Luke Shumaker # Maintainer (AUR): N30N -# Contributor: Anthony Martin -# Contributer: thomasd -# Contributer: karnath -# Contributer: MrBougo -# Contributor: Wolf Ramovsky +# Contributor (Arch): Anthony Martin +# Contributer (Arch): thomasd +# Contributer (Arch): karnath +# Contributer (Arch): MrBougo +# Contributor (Arch): Wolf Ramovsky pkgname=wmii-hg pkgver=2813 diff --git a/pcr/xcftools/PKGBUILD b/pcr/xcftools/PKGBUILD index 12bc05bd6..432cc8b93 100644 --- a/pcr/xcftools/PKGBUILD +++ b/pcr/xcftools/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Jonathan Frawley -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): Jonathan Frawley +# Maintainer: Márcio Silva pkgname=xcftools pkgver=1.0.7 pkgrel=2 diff --git a/pcr/xchat-otr/PKGBUILD b/pcr/xchat-otr/PKGBUILD index 7bc6e8c41..3f7ca74bd 100644 --- a/pcr/xchat-otr/PKGBUILD +++ b/pcr/xchat-otr/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Tom +# Contributor (Arch): Tom # Based on a quantax contribution for irssi-otr pkgname=xchat-otr diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index 14b8c8fbd..51b54b930 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Limao Luo -# Contributor: flan_suse +# Maintainer (Arch): Limao Luo +# Contributor (Arch): flan_suse # # This suite contains the following: # * xfwm4 theme diff --git a/pcr/xfwm4-titleless/PKGBUILD b/pcr/xfwm4-titleless/PKGBUILD index dd80d287d..174f52879 100644 --- a/pcr/xfwm4-titleless/PKGBUILD +++ b/pcr/xfwm4-titleless/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Christian Hesse -# Contributor: Evangelos Foutras -# Contributor: tobias +# Contributor (Arch): Christian Hesse +# Contributor (Arch): Evangelos Foutras +# Contributor (Arch): tobias # Maintainer : Parabola Aurélien DESBRIÈRES pkgname=xfwm4-titleless diff --git a/pcr/xonotic-git/PKGBUILD b/pcr/xonotic-git/PKGBUILD index 0a2ec7dca..1db3204ff 100644 --- a/pcr/xonotic-git/PKGBUILD +++ b/pcr/xonotic-git/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: MrBougo -# Contributor: wido -# Contributor: Alexander Suhoverhov +# Maintainer (Arch): MrBougo +# Contributor (Arch): wido +# Contributor (Arch): Alexander Suhoverhov pkgname=xonotic-git pkgver=20130214 diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD index 1cf561115..2f7d98597 100644 --- a/pcr/xrdp/PKGBUILD +++ b/pcr/xrdp/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Tomasz Zok -# Maintainer: techryda -# Contributor: Mathias R. -# Maintainer (Parabola): Esteban Carnevale +# Maintainer (Arch): Tomasz Zok +# Maintainer (Arch): techryda +# Contributor (Arch): Mathias R. +# Maintainer: Esteban Carnevale pkgname=xrdp pkgver=0.6.1 diff --git a/pcr/xtables-addons/PKGBUILD b/pcr/xtables-addons/PKGBUILD index 0b652408a..c84701e86 100644 --- a/pcr/xtables-addons/PKGBUILD +++ b/pcr/xtables-addons/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Vladimir Kutyavin +# Contributor (Arch): Vladimir Kutyavin # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=xtables-addons diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD index e668cd3ae..bb84d1a67 100644 --- a/pcr/yate/PKGBUILD +++ b/pcr/yate/PKGBUILD @@ -1,6 +1,6 @@ - # Maintainer: said - # Contributor: Yejun Yang - # Contributor: Biru Ionut + # Maintainer (Arch): said + # Contributor (Arch): Yejun Yang + # Contributor (Arch): Biru Ionut pkgname=yate pkgver=4.2.0 pkgrel=1 diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index f2dc2ac05..3893f3297 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Eric Bélanger -# Maintainer (Parabola): Alon Ivtsan +# Maintainer (Arch): Eric Bélanger +# Maintainer: Alon Ivtsan # Based on https://www.archlinux.org/packages/community/any/youtube-dl/ pkgname=youtube-dl-current diff --git a/pcr/zbar/PKGBUILD b/pcr/zbar/PKGBUILD index 199fc2bb8..063502849 100644 --- a/pcr/zbar/PKGBUILD +++ b/pcr/zbar/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Marti Raudsepp -# Contributor: Radu Andries -# Contributor: Andy Weidenbaum +# Maintainer (Arch): Marti Raudsepp +# Contributor (Arch): Radu Andries +# Contributor (Arch): Andy Weidenbaum pkgname=zbar pkgver=0.10 diff --git a/pcr/zbase32/PKGBUILD b/pcr/zbase32/PKGBUILD index b4373abb8..cbc73632c 100644 --- a/pcr/zbase32/PKGBUILD +++ b/pcr/zbase32/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Peter Simons -# Contributor: Nicolas Pouillard +# Contributor (Arch): Peter Simons +# Contributor (Arch): Nicolas Pouillard pkgname=zbase32 pkgver=1.1.5 pkgrel=1 diff --git a/pcr/zeroinstall-injector/PKGBUILD b/pcr/zeroinstall-injector/PKGBUILD index 120355775..6be6bc71e 100644 --- a/pcr/zeroinstall-injector/PKGBUILD +++ b/pcr/zeroinstall-injector/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: SpepS -# Contributor: Anton Bazhenov -# Contributor: Lone_Wolf +# Contributor (Arch): SpepS +# Contributor (Arch): Anton Bazhenov +# Contributor (Arch): Lone_Wolf # Maintainer : Parabola GNU / Linux-libre pkgname=zeroinstall-injector diff --git a/pcr/zfec/PKGBUILD b/pcr/zfec/PKGBUILD index 0c2487c6b..e2a33ae1b 100644 --- a/pcr/zfec/PKGBUILD +++ b/pcr/zfec/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Nicolas Pouillard -# Contributor: Peter Simons +# Maintainer (Arch): Nicolas Pouillard +# Contributor (Arch): Peter Simons pkgname=zfec pkgver=1.4.24 pkgrel=2 diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD index ff5fb1cd8..232d15e6e 100644 --- a/pcr/zoneminder/PKGBUILD +++ b/pcr/zoneminder/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: Jacek Burghardt -# Maintainer: Vojtech Aschenbrenner -# Contributor: Jason Gardner -# Contributor: Ross melin -# Maintainer (Parabola): Márcio Silva -# Contributor (Parabola): André Silva +# Maintainer (Arch): Jacek Burghardt +# Maintainer (Arch): Vojtech Aschenbrenner +# Contributor (Arch): Jason Gardner +# Contributor (Arch): Ross melin +# Maintainer: Márcio Silva +# Contributor: André Silva # based of debian squeeze package diff --git a/pcr/zsh-yaourt/PKGBUILD b/pcr/zsh-yaourt/PKGBUILD index af6541183..6a8e62f67 100644 --- a/pcr/zsh-yaourt/PKGBUILD +++ b/pcr/zsh-yaourt/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Jakub Ruzicka -# Contributor: Javier `Phrodo_00' Aravena +# Contributor (Arch): Jakub Ruzicka +# Contributor (Arch): Javier `Phrodo_00' Aravena # Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres pkgname=zsh-yaourt diff --git a/radio/idjc/PKGBUILD b/radio/idjc/PKGBUILD index 0de01f4e3..6ee8e29d7 100644 --- a/radio/idjc/PKGBUILD +++ b/radio/idjc/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor: Tobias Luther -# Contributor: GraveDigger -# Contributor: Gaetan Bisson +# Contributor (Arch): Tobias Luther +# Contributor (Arch): GraveDigger +# Contributor (Arch): Gaetan Bisson pkgname=idjc pkgver=0.8.8 diff --git a/radio/jack-rack/PKGBUILD b/radio/jack-rack/PKGBUILD index 26330bb2b..7363705b7 100644 --- a/radio/jack-rack/PKGBUILD +++ b/radio/jack-rack/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: DonVla -# Contributor: Patrick Leslie Polzer -# Contributor: Berkus -# Contributor: Daniele Paolella +# Maintainer (Arch): DonVla +# Contributor (Arch): Patrick Leslie Polzer +# Contributor (Arch): Berkus +# Contributor (Arch): Daniele Paolella pkgname=jack-rack pkgver=1.4.7 pkgrel=4 diff --git a/social/ahcpd/PKGBUILD b/social/ahcpd/PKGBUILD index a2f1e336f..a4c31e127 100644 --- a/social/ahcpd/PKGBUILD +++ b/social/ahcpd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Yann Lopez +# Maintainer (Arch): Yann Lopez pkgname=ahcpd pkgver=0.53 pkgrel=1 diff --git a/social/anubis/PKGBUILD b/social/anubis/PKGBUILD index 8835d2275..1b345a943 100644 --- a/social/anubis/PKGBUILD +++ b/social/anubis/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Nicolás Reynolds -# Contributor: Nathan Owe +# Contributor (Arch): Nathan Owe pkgname=anubis pkgver=4.1.1 pkgrel=2 diff --git a/social/babeld/PKGBUILD b/social/babeld/PKGBUILD index 5aa25f07f..485fecf05 100644 --- a/social/babeld/PKGBUILD +++ b/social/babeld/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (AUR): Yann Lopez -# Maintainer (Parabola): fauno +# Maintainer: fauno pkgname=babeld pkgver=1.3.4 pkgrel=1 diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD index b64c46ef0..23a2df1ee 100644 --- a/social/batctl/PKGBUILD +++ b/social/batctl/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Nathan Owe -# Maintainer: Thomas Weißschuh +# Contributor (Arch): Nathan Owe +# Maintainer (Arch): Thomas Weißschuh pkgname=batctl pkgver=2012.3.0 pkgrel=1 diff --git a/social/bip/PKGBUILD b/social/bip/PKGBUILD index fcb0ddcfe..6dd7ac8ba 100644 --- a/social/bip/PKGBUILD +++ b/social/bip/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Jaroslav Lichtblau +# Maintainer (Arch): Jaroslav Lichtblau pkgname=bip pkgver=0.8.8 diff --git a/social/bitcoin-daemon/PKGBUILD b/social/bitcoin-daemon/PKGBUILD index ddc5ac0ab..b00f974a3 100644 --- a/social/bitcoin-daemon/PKGBUILD +++ b/social/bitcoin-daemon/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: fauno -# Contributor: Artefact2 -# Contributor: shahid +# Contributor (Arch): Artefact2 +# Contributor (Arch): shahid # Based on bitcoin by -# Maintainer : shahid +# Maintainer (Arch): shahid pkgname=bitcoin-daemon _pkgname=bitcoin diff --git a/social/bitcoin/PKGBUILD b/social/bitcoin/PKGBUILD index 64810db4b..7efba1aef 100644 --- a/social/bitcoin/PKGBUILD +++ b/social/bitcoin/PKGBUILD @@ -1,4 +1,4 @@ -## Maintainer : shahid +## Maintainer (Arch): shahid ## Long PKGBUILD description, todo, wiki: ## * https://bitbucket.org/helllamer/archlinux-pkgbuild/wiki/pkgbuild/bitcoin diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD index 3c241473b..efe8d04e2 100644 --- a/social/diaspora-git/PKGBUILD +++ b/social/diaspora-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: fauno -# Maintainer: Hilton Medeiros -# Contributor: Jonne Haß -# Contributor: Splashy +# Maintainer (Arch): Hilton Medeiros +# Contributor (Arch): Jonne Haß +# Contributor (Arch): Splashy # After installing, see the Diaspora wiki page for more information: # https://wiki.archlinux.org/index.php/Diaspora diff --git a/social/dropbear/PKGBUILD b/social/dropbear/PKGBUILD index 2df24cb15..8d8d61409 100644 --- a/social/dropbear/PKGBUILD +++ b/social/dropbear/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Jaroslav Lichtblau -# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> -# Contributor: Jeremy Cowgar +# Maintainer (Arch): Jaroslav Lichtblau +# Contributor (Arch): Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> +# Contributor (Arch): Jeremy Cowgar pkgname=dropbear pkgver=0.53.1 diff --git a/social/haveged/PKGBUILD b/social/haveged/PKGBUILD index b5f2e680a..56e1db839 100644 --- a/social/haveged/PKGBUILD +++ b/social/haveged/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: kfgz -# Contributor: pootzko +# Maintainer (Arch): kfgz +# Contributor (Arch): pootzko pkgname=haveged pkgver=1.1 diff --git a/social/inadyn-opendns/PKGBUILD b/social/inadyn-opendns/PKGBUILD index 75e8dc1ae..c4163ddb5 100644 --- a/social/inadyn-opendns/PKGBUILD +++ b/social/inadyn-opendns/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Bug -# Maintainer: Bug +# Contributor (Arch): Bug +# Maintainer (Arch): Bug pkgname=inadyn-opendns pkgver=1.99 pkgrel=3 diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD index e3428763c..d9f2fe4e6 100644 --- a/social/liblockfile/PKGBUILD +++ b/social/liblockfile/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Andreas Wagner +# Contributor (Arch): Andreas Wagner pkgname=liblockfile pkgver=1.08_4 diff --git a/social/libpurple-minimal/PKGBUILD b/social/libpurple-minimal/PKGBUILD index b0adfd46d..f9c4ab63e 100644 --- a/social/libpurple-minimal/PKGBUILD +++ b/social/libpurple-minimal/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Magicking +# Maintainer (Arch): Magicking # Contributors: wzff BluePeppers n0nsense pkgname=libpurple-minimal pkgver=2.10.0 diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD index 57d833952..9f5dc114f 100644 --- a/social/lockfile-progs/PKGBUILD +++ b/social/lockfile-progs/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor: Andreas Wagner +# Contributor (Arch): Andreas Wagner pkgname=lockfile-progs pkgver=0.1.15 diff --git a/social/lua-cyrussasl/PKGBUILD b/social/lua-cyrussasl/PKGBUILD index d37eacc1c..29fb472b2 100644 --- a/social/lua-cyrussasl/PKGBUILD +++ b/social/lua-cyrussasl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Dwayne Bent +# Maintainer (Arch): Dwayne Bent pkgname=lua-cyrussasl pkgver=1.0.0 diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD index 3c5c590b8..5f32853e5 100644 --- a/social/monkeysphere/PKGBUILD +++ b/social/monkeysphere/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: fauno # Based on monkeysphere-git from -# Contributor: Olivier Mehani +# Contributor (Arch): Olivier Mehani # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.35 diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD index 816174590..99f334f7f 100644 --- a/social/netatalk/PKGBUILD +++ b/social/netatalk/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer: SJ_UnderWater -# Maintainer (Parabola): fauno@parabola.nu +# Maintainer (Arch): SJ_UnderWater +# Maintainer: fauno@parabola.nu # Based on netatalk package : -# Maintainer: Dominik Dingel -# Contributor: William Udovich -# Contributor: Farhan Yousaf +# Maintainer (Arch): Dominik Dingel +# Contributor (Arch): William Udovich +# Contributor (Arch): Farhan Yousaf pkgname=netatalk pkgver=3.0.1 diff --git a/social/nitroshare/PKGBUILD b/social/nitroshare/PKGBUILD index 7896a356e..19fca2a6c 100644 --- a/social/nitroshare/PKGBUILD +++ b/social/nitroshare/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Sid Karunaratne -# Contributor: Nathan Osman +# Maintainer (Arch): Sid Karunaratne +# Contributor (Arch): Nathan Osman pkgname=nitroshare pkgver=0.2 diff --git a/social/olsrd/PKGBUILD b/social/olsrd/PKGBUILD index dea029844..bb15319e6 100644 --- a/social/olsrd/PKGBUILD +++ b/social/olsrd/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: William Rea -# Maintainer: Claudio Pisa +# Contributor (Arch): William Rea +# Maintainer (Arch): Claudio Pisa pkgname=olsrd pkgver="0.6.1" pkgrel=1 diff --git a/social/poco/PKGBUILD b/social/poco/PKGBUILD index be15eea8a..d8c541d1d 100644 --- a/social/poco/PKGBUILD +++ b/social/poco/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Rodrigo Grumiche Silva -# Contributor: nozog -# Contributor: davidhjelm -# Contributor: Ray Kohler -# Contributor: Nathan Owe < ndowens04 at gmail dot com> +# Maintainer (Arch): Rodrigo Grumiche Silva +# Contributor (Arch): nozog +# Contributor (Arch): davidhjelm +# Contributor (Arch): Ray Kohler +# Contributor (Arch): Nathan Owe < ndowens04 at gmail dot com> pkgname=poco pkgver=1.4.2p1 diff --git a/social/python-relatorio/PKGBUILD b/social/python-relatorio/PKGBUILD index 6255eeee5..8cb09e0a0 100644 --- a/social/python-relatorio/PKGBUILD +++ b/social/python-relatorio/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Florian Walch -# Maintainer: Thomas Bahn +# Contributor (Arch): Florian Walch +# Maintainer (Arch): Thomas Bahn pkgname=python-relatorio pkgver=0.5.6 pkgrel=1 diff --git a/social/qxmlrpc/PKGBUILD b/social/qxmlrpc/PKGBUILD index 2e23c0a47..c9c45ca68 100644 --- a/social/qxmlrpc/PKGBUILD +++ b/social/qxmlrpc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Sid Karunaratne +# Maintainer (Arch): Sid Karunaratne pkgname=qxmlrpc pkgver=6 pkgrel=1 diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD index d68e97781..aa76804c8 100644 --- a/social/ruby-headers/PKGBUILD +++ b/social/ruby-headers/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: fauno -# Contributor: Hilton Medeiros +# Contributor (Arch): Hilton Medeiros pkgname=ruby-headers _pkgname=ruby diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD index 769757df4..9691a086b 100644 --- a/social/sipwitch/PKGBUILD +++ b/social/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Dan Serban -# Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva +# Maintainer (Arch): Dan Serban +# Contributors (Arch): David Zaragoza, Andrea Scarpino +# Maintainer: André Silva pkgname=sipwitch pkgver=1.2.4 diff --git a/social/sobby/PKGBUILD b/social/sobby/PKGBUILD index 50f847db9..1f5bd9150 100644 --- a/social/sobby/PKGBUILD +++ b/social/sobby/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Thomas Jost +# Maintainer (Arch): Thomas Jost pkgname=sobby pkgver=0.4.8 pkgrel=1 diff --git a/social/spectrum/PKGBUILD b/social/spectrum/PKGBUILD index 95040efb6..d5d8f859f 100644 --- a/social/spectrum/PKGBUILD +++ b/social/spectrum/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Sonny Piers -# Contributor: Tim Besard +# Maintainer (Arch): Sonny Piers +# Contributor (Arch): Tim Besard pkgname=spectrum pkgver=1.4.8 diff --git a/social/squirm/PKGBUILD b/social/squirm/PKGBUILD index da3a6d372..a28085b24 100644 --- a/social/squirm/PKGBUILD +++ b/social/squirm/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Spider.007 -# Contributor: Spider.007 +# Maintainer (Arch): Spider.007 +# Contributor (Arch): Spider.007 pkgname=squirm pkgver=1.26 pkgrel=1 diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD index 8c5e42885..1c8cba268 100644 --- a/social/strongswan/PKGBUILD +++ b/social/strongswan/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor: Jason Begley -# Contributor: Ray Kohler -# Maintainer: Daniel Riedemann -# Maintainer: Dhruv Desai +# Contributor (Arch): Jason Begley +# Contributor (Arch): Ray Kohler +# Maintainer (Arch): Daniel Riedemann +# Maintainer (Arch): Dhruv Desai pkgname=strongswan pkgver=4.5.3 diff --git a/social/tokyotyrant/PKGBUILD b/social/tokyotyrant/PKGBUILD index 74da4570c..317a934c8 100644 --- a/social/tokyotyrant/PKGBUILD +++ b/social/tokyotyrant/PKGBUILD @@ -1,5 +1,5 @@ -# # Maintainer: Angel Velasquez -# Contributor: Paul Sadauskas +# # Maintainer (Arch): Angel Velasquez +# Contributor (Arch): Paul Sadauskas pkgname=tokyotyrant pkgver=1.1.41 diff --git a/social/tomoyo-tools/PKGBUILD b/social/tomoyo-tools/PKGBUILD index aacd1dbe4..3ba53522d 100644 --- a/social/tomoyo-tools/PKGBUILD +++ b/social/tomoyo-tools/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Jamie Nguyen +# Maintainer (Arch): Jamie Nguyen pkgname=tomoyo-tools _basever=2.3.0 diff --git a/social/ucommon/PKGBUILD b/social/ucommon/PKGBUILD index 240fcc3db..ec34d126e 100644 --- a/social/ucommon/PKGBUILD +++ b/social/ucommon/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Dan Serban -# Contributor: Andrea Scarpino -# Contributor: David Zaragoza +# Maintainer (Arch): Dan Serban +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): David Zaragoza pkgname=ucommon pkgver=5.0.6 diff --git a/social/uftp/PKGBUILD b/social/uftp/PKGBUILD index 1dea3b5ba..10a2aced0 100644 --- a/social/uftp/PKGBUILD +++ b/social/uftp/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Markus Jochim -# Maintainer (Parabola): fauno +# Maintainer (Arch): Markus Jochim +# Maintainer: fauno pkgname=uftp pkgver=3.7.1 pkgrel=2 diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD index ee258f6f4..7b02c2533 100644 --- a/~coadde/mariadb/PKGBUILD +++ b/~coadde/mariadb/PKGBUILD @@ -1,8 +1,8 @@ # $Id$ -# Maintainer: -# Contributor: Andrea Scarpino -# Contributor: Douglas Soares de Andrade -# Maintainer (Parabola): Márcio Silva +# Maintainer (Arch): +# Contributor (Arch): Andrea Scarpino +# Contributor (Arch): Douglas Soares de Andrade +# Maintainer: Márcio Silva falsename=mysql _falsename=MySQL diff --git a/~emulatorman/nodejs-grunt-cli/PKGBUILD b/~emulatorman/nodejs-grunt-cli/PKGBUILD index e18327bfc..f9ecc675f 100644 --- a/~emulatorman/nodejs-grunt-cli/PKGBUILD +++ b/~emulatorman/nodejs-grunt-cli/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Mario Finelli -# Contributor: Andy Weidenbaum -# Contributor: Peter Wu +# Maintainer (Arch): Mario Finelli +# Contributor (Arch): Andy Weidenbaum +# Contributor (Arch): Peter Wu _npmname=grunt-cli pkgname=nodejs-$_npmname diff --git a/~emulatorman/nodejs-grunt/PKGBUILD b/~emulatorman/nodejs-grunt/PKGBUILD index fea5c6ae2..e1a8c2e2c 100644 --- a/~emulatorman/nodejs-grunt/PKGBUILD +++ b/~emulatorman/nodejs-grunt/PKGBUILD @@ -1,11 +1,11 @@ # Author: "Cowboy" Ben Alman (http://benalman.com/) -# Contributor: "Cowboy" Ben Alman (http://benalman.com/) -# Contributor: Kyle Robinson Young (http://dontkry.com/) -# Contributor: Tyler Kellen (http://goingslowly.com) -# Contributor: Sindre Sorhus (http://sindresorhus.com) -# Contributor: cowboy -# Contributor: tkellen -# Maintainer: cracoucass14 (http://twitter.com/cracoucass14) +# Contributor (Arch): "Cowboy" Ben Alman (http://benalman.com/) +# Contributor (Arch): Kyle Robinson Young (http://dontkry.com/) +# Contributor (Arch): Tyler Kellen (http://goingslowly.com) +# Contributor (Arch): Sindre Sorhus (http://sindresorhus.com) +# Contributor (Arch): cowboy +# Contributor (Arch): tkellen +# Maintainer (Arch): cracoucass14 (http://twitter.com/cracoucass14) _npmname=grunt pkgname=nodejs-grunt # All lowercase diff --git a/~lukeshu/conkeror-git/PKGBUILD b/~lukeshu/conkeror-git/PKGBUILD index 5d68e26c9..4f0fa71b6 100644 --- a/~lukeshu/conkeror-git/PKGBUILD +++ b/~lukeshu/conkeror-git/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (parabola): Luke Shumaker # Maintainer (k[community]): Stefan Husmann -# Contributor: Heeru Kiyura +# Contributor (Arch): Heeru Kiyura _pkgname=conkeror pkgname=conkeror-git diff --git a/~lukeshu/conkeror-git/SRCBUILD b/~lukeshu/conkeror-git/SRCBUILD index d02b9eaf1..4d56dbcff 100644 --- a/~lukeshu/conkeror-git/SRCBUILD +++ b/~lukeshu/conkeror-git/SRCBUILD @@ -1,7 +1,7 @@ -# Maintainer (parabola): Luke Shumaker # Maintainer (k[community]): Stefan Husmann -# Contributor: Heeru Kiyura +# Contributor (Arch): Heeru Kiyura pkgname=conkeror-git pkgver=20120228 diff --git a/~lukeshu/dasm/PKGBUILD b/~lukeshu/dasm/PKGBUILD index 79a7264b4..ef8fc3a30 100644 --- a/~lukeshu/dasm/PKGBUILD +++ b/~lukeshu/dasm/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Max Pray a.k.a. Synthead +# Maintainer (Arch): Max Pray a.k.a. Synthead pkgname=dasm pkgver=2.20.11 diff --git a/~lukeshu/dunst-lukeshu-git/PKGBUILD b/~lukeshu/dunst-lukeshu-git/PKGBUILD index 31037e113..c16526df9 100644 --- a/~lukeshu/dunst-lukeshu-git/PKGBUILD +++ b/~lukeshu/dunst-lukeshu-git/PKGBUILD @@ -2,7 +2,7 @@ # $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $ # Maintainer (Arch): Daniel Wallace -# Contributor: feuri +# Contributor (Arch): feuri _pkgname=dunst _pkgver=1.0.0 diff --git a/~lukeshu/libfreenect-git/PKGBUILD b/~lukeshu/libfreenect-git/PKGBUILD index edc9e7483..64d62feac 100644 --- a/~lukeshu/libfreenect-git/PKGBUILD +++ b/~lukeshu/libfreenect-git/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker -# Contributor: Sven Schneider +# Contributor (Arch): Sven Schneider # I am not giving libfreenect nearly the attention it deserves. # There are a lot of options for it that I'm ignoring. diff --git a/~lukeshu/make-graph/PKGBUILD b/~lukeshu/make-graph/PKGBUILD index 0d9320f69..48fa1ce81 100644 --- a/~lukeshu/make-graph/PKGBUILD +++ b/~lukeshu/make-graph/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Parabola): Luke Shumaker +# Maintainer: Luke Shumaker # Maintainer (Arch): Allan McRae -# Contributor: judd +# Contributor (Arch): judd _pkgname=make pkgname=$_pkgname-graph diff --git a/~lukeshu/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD index 7ac6abb87..0888c49ce 100644 --- a/~lukeshu/openni-all/openni-git/PKGBUILD +++ b/~lukeshu/openni-all/openni-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki +# Contributor (Arch): Sven Schneider +# Contributor (Arch): bugix +# Contributor (Arch): Lubosz Sarnecki # unfortunately we can't use $_suf in function names, but sed makes it ok _suf='-git' diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD index 0ebfac2e5..59db51458 100644 --- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD +++ b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker -# Contributor: pallegro from the AUR +# Contributor (Arch): pallegro from the AUR _pkgname=openni-module-primesensor pkgname=${_pkgname}-git diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD index 2a2abbdc5..1db0a8cec 100644 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD +++ b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker -# Contributor: pallegro from the AUR +# Contributor (Arch): pallegro from the AUR pkgname=openni-module-sensorkinect-git pkgver=20111211 diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD index 07f276b02..623ad5c14 100644 --- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD +++ b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki +# Contributor (Arch): Sven Schneider +# Contributor (Arch): bugix +# Contributor (Arch): Lubosz Sarnecki # unfortunately we can't use $_suf in function names, but sed makes it ok _suf='-unstable-git' diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD index 19d1575a1..ee1b20b97 100644 --- a/~lukeshu/openni-all/openni-unstable/PKGBUILD +++ b/~lukeshu/openni-all/openni-unstable/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki +# Contributor (Arch): Sven Schneider +# Contributor (Arch): bugix +# Contributor (Arch): Lubosz Sarnecki # unfortunately we can't use $_suf in function names, but sed makes it ok _suf='-unstable' diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD index 2cdc2fd7d..814d65305 100644 --- a/~lukeshu/openni-all/openni/PKGBUILD +++ b/~lukeshu/openni-all/openni/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker -# Contributor: Sven Schneider -# Contributor: bugix -# Contributor: Lubosz Sarnecki +# Contributor (Arch): Sven Schneider +# Contributor (Arch): bugix +# Contributor (Arch): Lubosz Sarnecki # unfortunately we can't use $_suf in function names, but sed makes it ok _suf='' diff --git a/~smv/sword-svn/PKGBUILD b/~smv/sword-svn/PKGBUILD index b5ddc53f4..5308a3e3a 100644 --- a/~smv/sword-svn/PKGBUILD +++ b/~smv/sword-svn/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Stefan Husmann -# Maintainer (Parabola): Sorin-Mihai Vârgolici +# Maintainer (Arch): Stefan Husmann +# Maintainer: Sorin-Mihai Vârgolici pkgname=sword-svn pkgver=2904 pkgrel=1 diff --git a/~smv/xiphos-svn/PKGBUILD b/~smv/xiphos-svn/PKGBUILD index 699990fec..81b71a3e8 100644 --- a/~smv/xiphos-svn/PKGBUILD +++ b/~smv/xiphos-svn/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor: Stefan Husmann -# Maintainer (Parabola): Sorin-Mihai Vârgolici +# Contributor (Arch): Stefan Husmann +# Maintainer: Sorin-Mihai Vârgolici pkgname=xiphos-svn pkgver=4482 pkgrel=1 -- cgit v1.2.3