From 86a5624291a8a72d9a0a2c51fcc64bf6e221524b Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 14 Feb 2014 03:37:58 +0000 Subject: Fri Feb 14 03:35:43 UTC 2014 --- libre/abiword-libre/PKGBUILD | 91 -- libre/abiword-libre/abiword.install | 12 - libre/abiword-libre/liberation-fonts.patch | 1694 -------------------- libre/bitlbee-libre/PKGBUILD | 65 - .../nfs-check-gssd-running-before-krb5i-auth.patch | 48 - ...my-gssd-directory-when-notification-fails.patch | 50 - ...the-clntXX-dir-if-creating-the-pipe-fails.patch | 32 - ...-add-an-info-file-for-the-dummy-gssd-pipe.patch | 96 -- ...te-a-new-dummy-pipe-for-gssd-to-hold-open.patch | 233 --- ...ace-gssd_running-with-more-reliable-check.patch | 139 -- libre/spectrwm-libre/PKGBUILD | 77 - libre/spectrwm-libre/spectrwm-no-preload | 2 - libre/spectrwm-libre/swmhack_path.patch | 27 - 13 files changed, 2566 deletions(-) delete mode 100644 libre/abiword-libre/PKGBUILD delete mode 100644 libre/abiword-libre/abiword.install delete mode 100644 libre/abiword-libre/liberation-fonts.patch delete mode 100644 libre/bitlbee-libre/PKGBUILD delete mode 100644 libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch delete mode 100644 libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch delete mode 100644 libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch delete mode 100644 libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch delete mode 100644 libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch delete mode 100644 libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch delete mode 100644 libre/spectrwm-libre/PKGBUILD delete mode 100644 libre/spectrwm-libre/spectrwm-no-preload delete mode 100644 libre/spectrwm-libre/swmhack_path.patch (limited to 'libre') diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD deleted file mode 100644 index d3ab71fff..000000000 --- a/libre/abiword-libre/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: PKGBUILD 203024 2014-01-01 19:07:24Z andyrtr $ -# Contributor: Giovanni Scafora -# Contributor: Maël Lavault -# Maintainer (Parabola): André Silva - -_pkgbase=abiword -pkgbase=abiword-libre -pkgname=('abiword-libre' 'abiword-libre-plugins') -pkgver=3.0.0 -pkgrel=1 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url='http://www.abisource.com' -makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' - 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' - 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'psiconv' - 'redland' 'libical') -options=('!makeflags') -source=(http://abisource.com/downloads/$_pkgbase/$pkgver/source/$_pkgbase-$pkgver.tar.gz - liberation-fonts.patch) -md5sums=('8d9c41cff3a8fbef8d0c835c65600e65' - 'e7ef4d436469ae4b24b0f784b09ab023') - -prepare() { - cd $_pkgbase-$pkgver - - # Replace nonfree fonts support to liberation fonts - patch -Np1 -i "${srcdir}/liberation-fonts.patch" -} - -build() { - cd $_pkgbase-$pkgver - -# Collab plugin is somehow broken: -# part service -#In file included from ./../../../backends/service/xp/RealmConnection.h:33:0, -# from ./../../../backends/service/xp/AbiCollabSaveInterceptor.h:23, -# from ./../../../backends/service/xp/ServiceAccountHandler.h:33, -# from ServiceUnixAccountHandler.h:23, -# from ServiceUnixAccountHandler.cpp:20: -#./../../../core/sync/xp/SynchronizedQueue.h:32:1: error: expected class-name before '{' token -# { -# part tcp -#In file included from ./../../../backends/tcp/xp/IOServerHandler.h:29:0, -# from ./../../../backends/tcp/xp/TCPAccountHandler.h:25, -# from TCPUnixAccountHandler.h:22, -# from TCPUnixAccountHandler.cpp:20: -#./../../../backends/tcp/xp/Session.h:34:63: error: expected class-name before ',' token -# class Session : public Synchronizer, public boost::noncopyable, public boost::enable_shared_from_this - - ./configure --prefix=/usr \ - --enable-shared \ - --disable-static \ - --enable-clipart \ - --enable-templates \ - --disable-builtin-plugins \ - --enable-plugins \ - --disable-collab-backend-service \ - --disable-collab-backend-tcp - make -} - -package_abiword-libre() { - pkgdesc='Fully-featured word processor, without nonfree fonts support' - depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils' - 'redland' 'libical' 'gtk-update-icon-cache') - install=$_pkgbase.install - optdepends=('abiword-libre-plugins') - conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword') - replaces=('abiword') - provides=("abiword=$pkgver") - - cd $_pkgbase-$pkgver - make DESTDIR="$pkgdir" install - - # split out plugins, there's no Makefile target for a clean way - mkdir ${srcdir}/_pluginsdir - mv "$pkgdir"/usr/lib/abiword-${pkgver%.*}/plugins ${srcdir}/_pluginsdir -} - -package_abiword-libre-plugins() { - pkgdesc='Additional plugins for Abiword' - depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' - 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf' 'psiconv') - conflicts=('abiword-plugins') - replaces=('abiword-plugins') - provides=("abiword-plugins=$pkgver") - - install -dm755 ${pkgdir}/usr/lib/abiword-${pkgver%.*} - mv ${srcdir}/_pluginsdir/plugins ${pkgdir}/usr/lib/abiword-${pkgver%.*}/ -} diff --git a/libre/abiword-libre/abiword.install b/libre/abiword-libre/abiword.install deleted file mode 100644 index cc4abc0b6..000000000 --- a/libre/abiword-libre/abiword.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch deleted file mode 100644 index 1660c3ead..000000000 --- a/libre/abiword-libre/liberation-fonts.patch +++ /dev/null @@ -1,1694 +0,0 @@ -diff --git a/plugins/latex/xp/ie_exp_LaTeX.cpp b/plugins/latex/xp/ie_exp_LaTeX.cpp -index f3d56c6..d5a77ef 100644 ---- a/plugins/latex/xp/ie_exp_LaTeX.cpp -+++ b/plugins/latex/xp/ie_exp_LaTeX.cpp -@@ -1046,7 +1046,7 @@ void s_LaTeX_Listener::_openSpan(PT_AttrPropIndex api) - m_pie->write("\\texttt{"); - m_NumCloseBrackets++; - } -- if (!strcmp("Arial", szValue) || -+ if (!strcmp("Liberation Sans", szValue) || - !strcmp("Helvetic", szValue) || - !strcmp("Luxi Sans",szValue)) { - m_pie->write("\\textsf{"); -diff --git a/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp b/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp -index ed167dc..e0831c9 100644 ---- a/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp -+++ b/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp -@@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (const gchar* pName, - fontFamily = pFontFamily; - - if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) { -- // e.g.: Turns a "'Times New Roman'" into a "Times New Roman". -+ // e.g.: Turns a "'Liberation Serif'" into a "Liberation Serif". - // OpenOffice.org sometimes adds those extra "'" surrounding the - // font family name if it's composed by more than one word. - m_fontFamilies[pStyleName] = -diff --git a/plugins/openwriter/xp/ie_exp_OpenWriter.cpp b/plugins/openwriter/xp/ie_exp_OpenWriter.cpp -index 1fab89a..a399c59 100644 ---- a/plugins/openwriter/xp/ie_exp_OpenWriter.cpp -+++ b/plugins/openwriter/xp/ie_exp_OpenWriter.cpp -@@ -900,12 +900,12 @@ bool OO_StylesWriter::writeStyles(PD_Document * pDoc, GsfOutfile * oo, OO_Styles - { - "\n", - "\n", -- "\n", -+ "\n", - "\n", - "\n", - "\n", - "\n", -- "\n", -+ "\n", - "\n" - }; - -diff --git a/plugins/openxml/common/xp/OXML_FontManager.cpp b/plugins/openxml/common/xp/OXML_FontManager.cpp -index 41b719d..2c53c1a 100644 ---- a/plugins/openxml/common/xp/OXML_FontManager.cpp -+++ b/plugins/openxml/common/xp/OXML_FontManager.cpp -@@ -34,7 +34,7 @@ - #include - - OXML_FontManager::OXML_FontManager() : -- m_defaultFont("Times New Roman") -+ m_defaultFont("Liberation Serif") - { - m_major_rts.clear(); - m_minor_rts.clear(); -diff --git a/plugins/openxml/common/xp/OXML_List.cpp b/plugins/openxml/common/xp/OXML_List.cpp -index 5bcb47a..88dba7e 100644 ---- a/plugins/openxml/common/xp/OXML_List.cpp -+++ b/plugins/openxml/common/xp/OXML_List.cpp -@@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_OpenXML* exporter) - txt = txt.replace(index+1, 1, 1, '1'+i); - } - -- std::string fontFamily("Times New Roman"); -+ std::string fontFamily("Liberation Serif"); - const gchar* listType = "bullet"; - switch(type) - { -diff --git a/plugins/passepartout/xp/ie_exp_Passepartout.cpp b/plugins/passepartout/xp/ie_exp_Passepartout.cpp -index e18e7f1..eec9367 100644 ---- a/plugins/passepartout/xp/ie_exp_Passepartout.cpp -+++ b/plugins/passepartout/xp/ie_exp_Passepartout.cpp -@@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(PT_AttrPropIndex api) - } - else - { -- TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); -+ TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); - m_pie->write(TempStr.utf8_str()); - } - -@@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT_AttrPropIndex api) - } - else - { -- TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); -+ TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); - m_pie->write(TempStr.utf8_str()); - } - -diff --git a/plugins/t602/xp/ie_imp_T602.cpp b/plugins/t602/xp/ie_imp_T602.cpp -index a57a9e2..f7f2301 100644 ---- a/plugins/t602/xp/ie_imp_T602.cpp -+++ b/plugins/t602/xp/ie_imp_T602.cpp -@@ -620,7 +620,7 @@ switch (c) - case 0x01: - m_sfont ^=1; - if (m_sfont & 1) -- { m_size=static_cast(0.8*m_basesize); m_family="Arial"; -+ { m_size=static_cast(0.8*m_basesize); m_family="Liberation Sans"; - /* FIXME? -> .profile?*/ } - else - { m_size=m_basesize; m_family=m_basefamily; } -diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -index 4c8d23c..6bcfd6d 100644 ---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -@@ -234,7 +234,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFont(void) - const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc); - #endif - if (!guiFontName) -- guiFontName = "'Times New Roman'"; -+ guiFontName = "'Liberation Serif'"; - - UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName(); - -diff --git a/src/af/gr/xp/gr_CairoGraphics.cpp b/src/af/gr/xp/gr_CairoGraphics.cpp -index 224b883..38ef911 100644 ---- a/src/af/gr/xp/gr_CairoGraphics.cpp -+++ b/src/af/gr/xp/gr_CairoGraphics.cpp -@@ -776,8 +776,8 @@ bool GR_CairoGraphics::shape(GR_ShapingInfo & si, GR_RenderInfo *& ri) - - /* - * Pango does a royally bad job of the font substitution in -- * pango_itemize(): it will happily return 'Times New Roman' as -- * font when we have requested 'Arial', even though the latter is -+ * pango_itemize(): it will happily return 'Liberation Serif' as -+ * font when we have requested 'Liberation Sans', even though the latter is - * present and has the necessary coverage. Consequently we have to - * do the font substitution manually even on the first shapping. - * -@@ -3054,7 +3054,7 @@ GR_Font * GR_CairoGraphics::getDefaultFont(GR_Font::FontFamilyEnum f, - - case GR_Font::FF_Technical: - case GR_Font::FF_BiDi: -- pszFontFamily = "Arial"; -+ pszFontFamily = "Liberation Sans"; - break; - - default: -diff --git a/src/af/util/xp/ut_misc.cpp b/src/af/util/xp/ut_misc.cpp -index 52246c3..bcd5a6d 100644 ---- a/src/af/util/xp/ut_misc.cpp -+++ b/src/af/util/xp/ut_misc.cpp -@@ -570,7 +570,7 @@ const gchar ** UT_setPropsToValue(const gchar ** props, const gchar * value) - } - - /*! -- splits the xml property string (font-size:24pt;font-face:Arial') into names and values -+ splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values - and stores them in an array - - the caller has to delete[] the array; the process is destructive to props -diff --git a/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib b/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib -index f21c815..e284cc9 100644 ---- a/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib -+++ b/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib -@@ -10910,7 +10910,7 @@ - 624 - - -- Times New Roman -+ Liberation Serif - _popUpItemAction: - - $class -diff --git a/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp b/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp -index bf94333..f77b40b 100644 ---- a/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp -+++ b/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp -@@ -904,7 +904,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::previewPicture (void) - - const gchar * file_name = gtk_file_chooser_get_uri (m_FC); - -- GR_Font * fnt = pGr->findFont("Times New Roman", -+ GR_Font * fnt = pGr->findFont("Liberation Serif", - "normal", "", "normal", - "", "12pt", - pSS->getLanguageName()); -diff --git a/src/af/xap/win/xap_Win32Dlg_About.cpp b/src/af/xap/win/xap_Win32Dlg_About.cpp -index 2cc4aa6..3aec3f0 100644 ---- a/src/af/xap/win/xap_Win32Dlg_About.cpp -+++ b/src/af/xap/win/xap_Win32Dlg_About.cpp -@@ -289,7 +289,7 @@ void XAP_Win32Dialog_About::runModal(XAP_Frame * pFrame) - lf.lfWeight = 0; - HFONT hfontSmall = CreateFontIndirectW(&lf); - -- wcscpy(lf.lfFaceName, L"Arial"); -+ wcscpy(lf.lfFaceName, L"Liberation Sans"); - lf.lfHeight = 36; - lf.lfWeight = FW_BOLD; - HFONT hfontHeading = CreateFontIndirectW(&lf); -diff --git a/src/af/xap/xp/xap_Dlg_FontChooser.cpp b/src/af/xap/xp/xap_Dlg_FontChooser.cpp -index 56ad605..8a89eb5 100644 ---- a/src/af/xap/xp/xap_Dlg_FontChooser.cpp -+++ b/src/af/xap/xp/xap_Dlg_FontChooser.cpp -@@ -570,7 +570,7 @@ void XAP_Preview_FontPreview::draw(const UT_Rect *clip) - std::string sWeight = getVal("font-weight"); - - if(sFamily.empty()) -- sFamily = "Times New Roman"; -+ sFamily = "Liberation Serif"; - - if(sStyle.empty()) - sStyle = "normal"; -diff --git a/src/af/xap/xp/xap_Dlg_Zoom.cpp b/src/af/xap/xp/xap_Dlg_Zoom.cpp -index 25f1a38..c025206 100644 ---- a/src/af/xap/xp/xap_Dlg_Zoom.cpp -+++ b/src/af/xap/xp/xap_Dlg_Zoom.cpp -@@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFromGC(GR_Graphics * gc, - UT_ASSERT(m_zoomPreview); - - m_zoomPreview->setWindowSize(width, height); -- m_zoomPreview->setString("10-pt Times New Roman"); -+ m_zoomPreview->setString("10-pt Liberation Serif"); - m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL); - m_zoomPreview->setZoomPercent(m_zoomPercent); - -diff --git a/src/af/xap/xp/xap_Preview_Zoom.cpp b/src/af/xap/xp/xap_Preview_Zoom.cpp -index 3ac69e1..0fdae0e 100644 ---- a/src/af/xap/xp/xap_Preview_Zoom.cpp -+++ b/src/af/xap/xp/xap_Preview_Zoom.cpp -@@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Preview_Zoom::tFont f) - { - case XAP_Preview_Zoom::font_NORMAL: - sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100)); -- found = m_gc->findFont("Times New Roman", -+ found = m_gc->findFont("Liberation Serif", - "normal", "", "normal", - "", fontString, - NULL); -diff --git a/src/text/fmt/xp/fl_BlockLayout.cpp b/src/text/fmt/xp/fl_BlockLayout.cpp -index f56e1f5..f0d8dd5 100644 ---- a/src/text/fmt/xp/fl_BlockLayout.cpp -+++ b/src/text/fmt/xp/fl_BlockLayout.cpp -@@ -10260,7 +10260,7 @@ void fl_BlockLayout::StartList( const gchar * style, pf_Frag_Strux* prevSDH) - szDec="."; - if(!szFont) - { -- szFont = "Times New Roman"; -+ szFont = "Liberation Serif"; - UT_ASSERT(UT_SHOULD_NOT_HAPPEN); - } - } -diff --git a/src/text/fmt/xp/fp_Line.cpp b/src/text/fmt/xp/fp_Line.cpp -index 8be126c..ede4ddd 100644 ---- a/src/text/fmt/xp/fp_Line.cpp -+++ b/src/text/fmt/xp/fp_Line.cpp -@@ -1856,7 +1856,7 @@ void fp_Line::_doClearScreenFromRunToEnd(UT_sint32 runIndex) - pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex)); - - // Handle case where character extends behind the left side -- // like italic Times New Roman f. Clear a litle bit before if -+ // like italic Liberation Serif f. Clear a litle bit before if - // there is clear screen there - UT_sint32 j = runIndex - 1; - -diff --git a/src/text/fmt/xp/fp_TextRun.cpp b/src/text/fmt/xp/fp_TextRun.cpp -index 0e93665..ddb46cb 100644 ---- a/src/text/fmt/xp/fp_TextRun.cpp -+++ b/src/text/fmt/xp/fp_TextRun.cpp -@@ -1442,7 +1442,7 @@ void fp_TextRun::_clearScreen(bool /* bFullLineHeightRect */) - - // - // Handle case where character extend behind the left side -- // like italic Times New Roman f -+ // like italic Liberation Serif f - // - fp_Line * thisLine = getLine(); - fp_Run * pPrev = getPrevRun(); -diff --git a/src/text/fmt/xp/fv_View.cpp b/src/text/fmt/xp/fv_View.cpp -index 38cf5cf..360f99d 100644 ---- a/src/text/fmt/xp/fv_View.cpp -+++ b/src/text/fmt/xp/fv_View.cpp -@@ -586,9 +586,9 @@ FV_View::FV_View(XAP_App * pApp, void* pParentData, FL_DocLayout* pLayout) - s += pCountry; - } - -- // do a fuzzy match for Times New Roman -+ // do a fuzzy match for Liberation Serif - const char * pszFamily = -- GR_Graphics::findNearestFont ("Times New Roman", -+ GR_Graphics::findNearestFont ("Liberation Serif", - "normal", "normal", - "normal", "normal", - "12pt", s.utf8_str()); -diff --git a/src/text/ptbl/xp/pp_Property.cpp b/src/text/ptbl/xp/pp_Property.cpp -index 2c9a27b..c191b38 100644 ---- a/src/text/ptbl/xp/pp_Property.cpp -+++ b/src/text/ptbl/xp/pp_Property.cpp -@@ -104,7 +104,7 @@ static PP_Property _props[] = - - { "field-color", "dcdcdc", true, NULL, PP_LEVEL_FIELD}, - { "field-font", "NULL", true, NULL, PP_LEVEL_FIELD}, -- { "font-family", "Times New Roman", true, NULL, PP_LEVEL_CHAR}, -+ { "font-family", "Liberation Serif", true, NULL, PP_LEVEL_CHAR}, - { "font-size", "12pt", true, NULL, PP_LEVEL_CHAR}, // MS word defaults to 10pt, but it just seems too small - { "font-stretch", "normal", true, NULL, PP_LEVEL_CHAR}, - { "font-style", "normal", true, NULL, PP_LEVEL_CHAR}, -diff --git a/src/text/ptbl/xp/pp_Revision.cpp b/src/text/ptbl/xp/pp_Revision.cpp -index 47a9976..ebfc7f5 100644 ---- a/src/text/ptbl/xp/pp_Revision.cpp -+++ b/src/text/ptbl/xp/pp_Revision.cpp -@@ -436,7 +436,7 @@ void PP_RevisionAttr::_init(const gchar *r) - return; - - // the string we are parsing looks like -- // "+1,-2,!3{font-family: Times New Roman}" -+ // "+1,-2,!3{font-family: Liberation Serif}" - - // first duplicate the string so we can play with it ... - char * s = (char*) g_strdup(r); -diff --git a/src/text/ptbl/xp/pp_Revision.h b/src/text/ptbl/xp/pp_Revision.h -index f093ef0..9f77e84 100644 ---- a/src/text/ptbl/xp/pp_Revision.h -+++ b/src/text/ptbl/xp/pp_Revision.h -@@ -116,7 +116,7 @@ class ABI_EXPORT PP_Revision: public PP_AttrProp - where n is a numerical id of the revision and props is regular - property string, for instance - -- font-family:Times New Roman -+ font-family:Liberation Serif - - revoval of property/attribute is indicated by setting to -/-, e.g., - -diff --git a/src/text/ptbl/xp/pt_PT_Styles.cpp b/src/text/ptbl/xp/pt_PT_Styles.cpp -index 3829f0d..c9f370c 100644 ---- a/src/text/ptbl/xp/pt_PT_Styles.cpp -+++ b/src/text/ptbl/xp/pt_PT_Styles.cpp -@@ -176,7 +176,7 @@ bool pt_PieceTable::_loadBuiltinStyles(void) - s += pCountry; - } - -- const char* pszFamily = XAP_App::findNearestFont("Times New Roman", -+ const char* pszFamily = XAP_App::findNearestFont("Liberation Serif", - "normal", "", - "normal", "", "12pt", - s.utf8_str()); -@@ -188,7 +188,7 @@ bool pt_PieceTable::_loadBuiltinStyles(void) - "text-indent:0in; text-position:normal; line-height:1.0; " - "color:000000; bgcolor:transparent; widows:2", pszFamily); - -- pszFamily = XAP_App::findNearestFont("Arial", "normal", "", -+ pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "", - "normal", "", "12pt", s.utf8_str()); - - // used to set the dom-dir of the style here, but we do not want to do that. The -@@ -263,7 +263,7 @@ bool pt_PieceTable::_loadBuiltinStyles(void) - UT_String_sprintf(stTmp, list_fmt, "Arrowhead List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", pszFamily, "NULL"); - _s("Arrowhead List",false, "P", "", "Current Settings", stTmp.c_str()); - -- // pszFamily is the nearest font to Arial found in the system -+ // pszFamily is the nearest font to Liberation Sans found in the system - UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; " - "start-value:1; margin-left:0.0in; text-indent:0.0in; " - "field-color:transparent; list-delim:%%L.; field-font:%s; " -@@ -274,7 +274,7 @@ bool pt_PieceTable::_loadBuiltinStyles(void) - _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str()); - _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str()); - -- // pszFamily is the nearest font to Arial found in the system -+ // pszFamily is the nearest font to Liberation Sans found in the system - - UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", "."); - -diff --git a/src/wp/ap/xp/ap_Dialog_Lists.cpp b/src/wp/ap/xp/ap_Dialog_Lists.cpp -index 5aa32cb..dfeb4c1 100644 ---- a/src/wp/ap/xp/ap_Dialog_Lists.cpp -+++ b/src/wp/ap/xp/ap_Dialog_Lists.cpp -@@ -1109,7 +1109,7 @@ void AP_Lists_preview::setData(const gchar * pszFont,float fAlign,float fIndent) - // - if(!pszFont || strcmp(pszFont,"NULL")== 0) - { -- m_pFont = m_gc->findFont("Times New Roman", -+ m_pFont = m_gc->findFont("Liberation Serif", - "normal", "", "normal", - "", "16pt", NULL); - } -diff --git a/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp b/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp -index ecfdfcb..db3a518 100644 ---- a/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp -+++ b/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp -@@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageNumbers (GR_Graphics * gc) - char fontString [10]; - sprintf(fontString, "%dpt", 8); - -- GR_Font * found = m_gc->findFont("Times New Roman", "normal", -+ GR_Font * found = m_gc->findFont("Liberation Serif", "normal", - "", "normal", "", fontString, - NULL); - -diff --git a/src/wp/ap/xp/ap_Preview_Annotation.cpp b/src/wp/ap/xp/ap_Preview_Annotation.cpp -index 5068315..91571e3 100644 ---- a/src/wp/ap/xp/ap_Preview_Annotation.cpp -+++ b/src/wp/ap/xp/ap_Preview_Annotation.cpp -@@ -95,7 +95,7 @@ void AP_Preview_Annotation::setSizeFromAnnotation(void) - pG = pView->getGraphics(); - - UT_return_if_fail(pG); -- GR_Font * pFont = pG->findFont("Times New Roman", "normal", -+ GR_Font * pFont = pG->findFont("Liberation Serif", "normal", - "normal", "normal", - "normal", "12pt", - NULL); -@@ -124,7 +124,7 @@ void AP_Preview_Annotation::draw(const UT_Rect *clip) - UT_RGBColor FGcolor(0,0,0); - UT_RGBColor BGcolor(m_clrBackground); - -- m_pFont = m_gc->findFont("Times New Roman", "normal", -+ m_pFont = m_gc->findFont("Liberation Serif", "normal", - "normal", "normal", - "normal", "12pt", - NULL); -diff --git a/src/wp/ap/xp/ap_Preview_Paragraph.cpp b/src/wp/ap/xp/ap_Preview_Paragraph.cpp -index fc4dc38..fba04f1 100644 ---- a/src/wp/ap/xp/ap_Preview_Paragraph.cpp -+++ b/src/wp/ap/xp/ap_Preview_Paragraph.cpp -@@ -540,7 +540,7 @@ void AP_Preview_Paragraph::draw(const UT_Rect *clip) - bool AP_Preview_Paragraph::_loadDrawFont(const char *name) - { - // we draw at 7 points in this preview -- GR_Font * font = m_gc->findFont(name ? name : "Times New Roman", -+ GR_Font * font = m_gc->findFont(name ? name : "Liberation Serif", - "normal", "", "normal", - "", "7pt", - NULL); // might need to get the real lang -diff --git a/src/wp/impexp/xp/ie_imp_MsWord_97.cpp b/src/wp/impexp/xp/ie_imp_MsWord_97.cpp -index 4673f80..d194004 100644 ---- a/src/wp/impexp/xp/ie_imp_MsWord_97.cpp -+++ b/src/wp/impexp/xp/ie_imp_MsWord_97.cpp -@@ -628,10 +628,10 @@ s_fieldFontForListStyle (MSWordListIdType id) - return "NULL"; - - case WLNF_UPPER_LETTER: // upper letter -- return "Times New Roman"; -+ return "Liberation Serif"; - - case WLNF_LOWER_LETTER: // lower letter -- return "Times New Roman"; -+ return "Liberation Serif"; - - case WLNF_BULLETS: // bullet list - UT_DEBUGMSG(("Fieldfont set to symbol \n")); -@@ -639,11 +639,11 @@ s_fieldFontForListStyle (MSWordListIdType id) - - case WLNF_EUROPEAN_ARABIC: - case WLNF_ORDINAL: // ordinal -- return "Times New Roman"; -+ return "Liberation Serif"; - - default: -- UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id)); -- return "Times New Roman"; -+ UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id)); -+ return "Liberation Serif"; - } - } - -@@ -5250,7 +5250,7 @@ void IE_Imp_MsWord_97::_generateCharProps(UT_String &s, const CHP * achp, wvPars - if(fname) - s += fname; - else -- s += "Times New Roman"; -+ s += "Liberation Serif"; - FREEP(fname); - } - -diff --git a/src/wp/impexp/xp/ie_imp_RTF.cpp b/src/wp/impexp/xp/ie_imp_RTF.cpp -index 97a6f29..3177c9c 100644 ---- a/src/wp/impexp/xp/ie_imp_RTF.cpp -+++ b/src/wp/impexp/xp/ie_imp_RTF.cpp -@@ -6313,11 +6313,11 @@ bool IE_Imp_RTF::buildCharacterProps(std::string & propBuffer) - // {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;} - // note the empty slot after the panose entry - // later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils -- // this turns those into "Times New Roman" for now, as a hack to keep from crashing -+ // this turns those into "Liberation Serif" for now, as a hack to keep from crashing - if ( pFont->m_pFontName != NULL ) - propBuffer += pFont->m_pFontName; - else -- propBuffer += "Times New Roman"; -+ propBuffer += "Liberation Serif"; - } - if (m_currentRTFState.m_charProps.m_hasColour) - { -@@ -9034,7 +9034,7 @@ bool IE_Imp_RTF::ReadFontTable() - { - // NB: Ignores whitespace until we've seen non-whitespace data. - // This means we pick up the spaces in font names like -- // "Times New Roman", but it also means that any font names -+ // "Liberation Serif", but it also means that any font names - // that genuinely start with spaces will have them discarded. - // This is hopefully not a problem. - tokenType = NextToken(keyword, ¶meter,& paramUsed, -@@ -9102,11 +9102,11 @@ bool IE_Imp_RTF::ReadFontTable() - // It's possible that the font name will be empty. This might happend - // because the font table didn't specify a name, or because the \ansicpgN - // command was invalid, in which case the mbtowc convertion might fail. -- // In these cases, substitute "Times New Roman". -+ // In these cases, substitute "Liberation Serif". - if (!sFontNamesAndPanose[SFontTableState::MainFontName].length()) - { -- UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex)); -- sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman"; -+ UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex)); -+ sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif"; - } - // Validate and post-process the Panose string. - if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) -diff --git a/user/wp/readme.abw b/user/wp/readme.abw -index 7bf2cdc..48e3bb6 100644 ---- a/user/wp/readme.abw -+++ b/user/wp/readme.abw -@@ -16,9 +16,9 @@ - - - -- -- -- -+ -+ -+ - - -
-diff --git a/user/wp/templates/Business-Letter.awt b/user/wp/templates/Business-Letter.awt -index 524558a..9448277 100644 ---- a/user/wp/templates/Business-Letter.awt -+++ b/user/wp/templates/Business-Letter.awt -@@ -19,14 +19,14 @@ - - - -- -- -- -+ -+ -+ - -- -- -- -- -+ -+ -+ -+ - - -
-diff --git a/user/wp/templates/Business-Report.awt b/user/wp/templates/Business-Report.awt -index c2e85c9..f2f5b16 100644 ---- a/user/wp/templates/Business-Report.awt -+++ b/user/wp/templates/Business-Report.awt -@@ -21,7 +21,7 @@ -

-

-

Title

--

Subtitle

-+

Subtitle

-

-

Release 1.0

-

-@@ -99,11 +99,11 @@ -
-

-

--

Heading 1

-+

Heading 1

-

text

--

Heading 2

-+

Heading 2

-

text

--

Heading 3

-+

Heading 3

-

-
-
-diff --git a/user/wp/templates/Employee-Directory.awt b/user/wp/templates/Employee-Directory.awt -index c4f7ebc..b0faa54 100644 ---- a/user/wp/templates/Employee-Directory.awt -+++ b/user/wp/templates/Employee-Directory.awt -@@ -10,9 +10,9 @@ - - -
--

Company Name

--

Directory of Employees

--

-+

Company Name

-+

Directory of Employees

-+

-

-

-

-@@ -36,59 +36,59 @@ -

Normal Style (123) 555-1212

-

-

--

Department Name

--

The big boss upstairs (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

--

--

Department Name

--

The big boss upstairs (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

--

--

Department Name

--

The big boss upstairs (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

--

--

Department Name

--

The big boss upstairs (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

Last Name, First Name (123) 555-1212

--

--

--

General Numbers

--

Front Desk (123) 555-1212

--

Security (123) 555-1212

--

Building Management (123) 555-1212

--

Other General Numbers (123) 555-1212

-+

Department Name

-+

The big boss upstairs (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

-+

-+

Department Name

-+

The big boss upstairs (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

-+

-+

Department Name

-+

The big boss upstairs (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

-+

-+

Department Name

-+

The big boss upstairs (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

Last Name, First Name (123) 555-1212

-+

-+

-+

General Numbers

-+

Front Desk (123) 555-1212

-+

Security (123) 555-1212

-+

Building Management (123) 555-1212

-+

Other General Numbers (123) 555-1212

-
- - -diff --git a/user/wp/templates/Fax-Coversheet.awt b/user/wp/templates/Fax-Coversheet.awt -index acc7ba8..cc5779c 100644 ---- a/user/wp/templates/Fax-Coversheet.awt -+++ b/user/wp/templates/Fax-Coversheet.awt -@@ -10,26 +10,26 @@ - - -
--

Company Name

--

Company Address Line 1

--

Company Address Line 2

--

Company Address Line 3

--

--

FAX

--

TO: From:

--

Fax: Pages:

--

Phone: Date:

-+

Company Name

-+

Company Address Line 1

-+

Company Address Line 2

-+

Company Address Line 3

-+

-+

FAX

-+

TO: From:

-+

Fax: Pages:

-+

Phone: Date:

-

-

Re: CC:

-

-

--

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

--

-+

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

-+

-

-

--

Comments

-+

Comments

-

--

This text should the replaced with your comments about the fax and any additional comment to the receiver.

-+

This text should the replaced with your comments about the fax and any additional comment to the receiver.

-
- - -diff --git a/user/wp/templates/Friendly-Letter.awt b/user/wp/templates/Friendly-Letter.awt -index 5a25db1..2e687fc 100644 ---- a/user/wp/templates/Friendly-Letter.awt -+++ b/user/wp/templates/Friendly-Letter.awt -@@ -16,12 +16,12 @@ - - - -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ - - -
-diff --git a/user/wp/templates/Memo.awt b/user/wp/templates/Memo.awt -index 79b5538..560a4cd 100644 ---- a/user/wp/templates/Memo.awt -+++ b/user/wp/templates/Memo.awt -@@ -14,10 +14,10 @@ - Fri Mar 12 21:07:56 2004 - - -- -- -- -- -+ -+ -+ -+ - - - -@@ -59,10 +59,10 @@ -

The box that this text is in uses AbiWord's table support to draw the border. You can either allow the border to fit to the size of the text as it is now, or press <ENTER> repeatedly at the end of your memo to expand the border to fill the rest of the page.

-

Don't forget to change the header and footer before printing! If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.

-

The styles used in this document for correct conversion, import, export, and HTML are:

--

Heading 1 for Company Name

--

Heading 2 for Slogan

--

Heading 3 for "Date:", "To:", etc.

--

Normal for body text

-+

Heading 1 for Company Name

-+

Heading 2 for Slogan

-+

Heading 3 for "Date:", "To:", etc.

-+

Normal for body text

- - -

-diff --git a/user/wp/templates/Press-Release.awt b/user/wp/templates/Press-Release.awt -index 708bce7..4d8bac1 100644 ---- a/user/wp/templates/Press-Release.awt -+++ b/user/wp/templates/Press-Release.awt -@@ -16,19 +16,19 @@ - - - -- -- -- -- -+ -+ -+ -+ - - - -- -+ - - - - -- -+ - - - -@@ -36,19 +36,19 @@ - - - -- -- -- -+ -+ -+ - - - - -- -- -- -+ -+ -+ - - -- -+ - - - -@@ -77,7 +77,7 @@ -

- - --

FOR IMMEDIATE RELEASE

-+

FOR IMMEDIATE RELEASE

- - -

-diff --git a/user/wp/templates/Resume.awt b/user/wp/templates/Resume.awt -index 1e61cdd..8eda0b7 100644 ---- a/user/wp/templates/Resume.awt -+++ b/user/wp/templates/Resume.awt -@@ -14,11 +14,11 @@ - Fri Mar 12 22:08:25 2004 - - -- -- -- -- -- -+ -+ -+ -+ -+ - - -
-diff --git a/user/wp/templates/normal.awt b/user/wp/templates/normal.awt -index 4c83f82..e7fcb00 100644 ---- a/user/wp/templates/normal.awt -+++ b/user/wp/templates/normal.awt -@@ -9,7 +9,7 @@ - - - -- -+ - - - -diff --git a/user/wp/templates/normal.awt-am_ET b/user/wp/templates/normal.awt-am_ET -index cb1a8d4..c7b7707 100644 ---- a/user/wp/templates/normal.awt-am_ET -+++ b/user/wp/templates/normal.awt-am_ET -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ar b/user/wp/templates/normal.awt-ar -index 9aa7a5c..0cd8882 100644 ---- a/user/wp/templates/normal.awt-ar -+++ b/user/wp/templates/normal.awt-ar -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ar_EG b/user/wp/templates/normal.awt-ar_EG -index 5fcf2d1..b920dcc 100644 ---- a/user/wp/templates/normal.awt-ar_EG -+++ b/user/wp/templates/normal.awt-ar_EG -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ar_SA b/user/wp/templates/normal.awt-ar_SA -index 09c1bbb..12ad0d6 100644 ---- a/user/wp/templates/normal.awt-ar_SA -+++ b/user/wp/templates/normal.awt-ar_SA -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-bg_BG b/user/wp/templates/normal.awt-bg_BG -index df6f2bf..d789046 100644 ---- a/user/wp/templates/normal.awt-bg_BG -+++ b/user/wp/templates/normal.awt-bg_BG -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ca_ES b/user/wp/templates/normal.awt-ca_ES -index 0a337a2..69fecfd 100644 ---- a/user/wp/templates/normal.awt-ca_ES -+++ b/user/wp/templates/normal.awt-ca_ES -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-cs_CZ b/user/wp/templates/normal.awt-cs_CZ -index 3e5e87e..d2cb937 100644 ---- a/user/wp/templates/normal.awt-cs_CZ -+++ b/user/wp/templates/normal.awt-cs_CZ -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-da_DK b/user/wp/templates/normal.awt-da_DK -index 6ce3d83..f8706cb 100644 ---- a/user/wp/templates/normal.awt-da_DK -+++ b/user/wp/templates/normal.awt-da_DK -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-de b/user/wp/templates/normal.awt-de -index 8faa619..c0c18f7 100644 ---- a/user/wp/templates/normal.awt-de -+++ b/user/wp/templates/normal.awt-de -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-de_AT b/user/wp/templates/normal.awt-de_AT -index 9abfde1..d0ec20e 100644 ---- a/user/wp/templates/normal.awt-de_AT -+++ b/user/wp/templates/normal.awt-de_AT -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-de_CH b/user/wp/templates/normal.awt-de_CH -index 0aa531a..24b0f8d 100644 ---- a/user/wp/templates/normal.awt-de_CH -+++ b/user/wp/templates/normal.awt-de_CH -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-de_DE b/user/wp/templates/normal.awt-de_DE -index 0190408..6372e78 100644 ---- a/user/wp/templates/normal.awt-de_DE -+++ b/user/wp/templates/normal.awt-de_DE -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-div_MV b/user/wp/templates/normal.awt-div_MV -index 9a8c50e..88270ce 100644 ---- a/user/wp/templates/normal.awt-div_MV -+++ b/user/wp/templates/normal.awt-div_MV -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-el_GR b/user/wp/templates/normal.awt-el_GR -index e1c8de5..1db03a4 100644 ---- a/user/wp/templates/normal.awt-el_GR -+++ b/user/wp/templates/normal.awt-el_GR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_AU b/user/wp/templates/normal.awt-en_AU -index c7fa4c9..0e29beb 100644 ---- a/user/wp/templates/normal.awt-en_AU -+++ b/user/wp/templates/normal.awt-en_AU -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_CA b/user/wp/templates/normal.awt-en_CA -index 3729a04..cff6807 100644 ---- a/user/wp/templates/normal.awt-en_CA -+++ b/user/wp/templates/normal.awt-en_CA -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_GB b/user/wp/templates/normal.awt-en_GB -index 14b8bcf..55364cd 100644 ---- a/user/wp/templates/normal.awt-en_GB -+++ b/user/wp/templates/normal.awt-en_GB -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_IE b/user/wp/templates/normal.awt-en_IE -index 95e3fc7..7b0c3a5 100644 ---- a/user/wp/templates/normal.awt-en_IE -+++ b/user/wp/templates/normal.awt-en_IE -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_NZ b/user/wp/templates/normal.awt-en_NZ -index 70016d2..0871e93 100644 ---- a/user/wp/templates/normal.awt-en_NZ -+++ b/user/wp/templates/normal.awt-en_NZ -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-en_ZA b/user/wp/templates/normal.awt-en_ZA -index ebe7ee3..c4f7795 100644 ---- a/user/wp/templates/normal.awt-en_ZA -+++ b/user/wp/templates/normal.awt-en_ZA -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-es b/user/wp/templates/normal.awt-es -index 12c611c..a2067e0 100644 ---- a/user/wp/templates/normal.awt-es -+++ b/user/wp/templates/normal.awt-es -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-es_AR b/user/wp/templates/normal.awt-es_AR -index 87130b5..fc8ac38 100644 ---- a/user/wp/templates/normal.awt-es_AR -+++ b/user/wp/templates/normal.awt-es_AR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-es_ES b/user/wp/templates/normal.awt-es_ES -index 87130b5..fc8ac38 100644 ---- a/user/wp/templates/normal.awt-es_ES -+++ b/user/wp/templates/normal.awt-es_ES -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-es_IR b/user/wp/templates/normal.awt-es_IR -index 4d3e321..33c7144 100644 ---- a/user/wp/templates/normal.awt-es_IR -+++ b/user/wp/templates/normal.awt-es_IR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-es_MX b/user/wp/templates/normal.awt-es_MX -index 52c3411..2522a82 100644 ---- a/user/wp/templates/normal.awt-es_MX -+++ b/user/wp/templates/normal.awt-es_MX -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fa_IR b/user/wp/templates/normal.awt-fa_IR -index db24783..a0f0bde 100644 ---- a/user/wp/templates/normal.awt-fa_IR -+++ b/user/wp/templates/normal.awt-fa_IR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fi_FI b/user/wp/templates/normal.awt-fi_FI -index 1471a71..b65fa66 100644 ---- a/user/wp/templates/normal.awt-fi_FI -+++ b/user/wp/templates/normal.awt-fi_FI -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fr b/user/wp/templates/normal.awt-fr -index 4e94583..67ae7c2 100644 ---- a/user/wp/templates/normal.awt-fr -+++ b/user/wp/templates/normal.awt-fr -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fr_BE b/user/wp/templates/normal.awt-fr_BE -index 8b310c4..d4b7723 100644 ---- a/user/wp/templates/normal.awt-fr_BE -+++ b/user/wp/templates/normal.awt-fr_BE -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fr_CA b/user/wp/templates/normal.awt-fr_CA -index e673aac..c3bb3fd 100644 ---- a/user/wp/templates/normal.awt-fr_CA -+++ b/user/wp/templates/normal.awt-fr_CA -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fr_CH b/user/wp/templates/normal.awt-fr_CH -index 1888a71..eb4b5de 100644 ---- a/user/wp/templates/normal.awt-fr_CH -+++ b/user/wp/templates/normal.awt-fr_CH -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-fr_FR b/user/wp/templates/normal.awt-fr_FR -index f877981..0f523f6 100644 ---- a/user/wp/templates/normal.awt-fr_FR -+++ b/user/wp/templates/normal.awt-fr_FR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-gl_ES b/user/wp/templates/normal.awt-gl_ES -index 7f4876b..006645e 100644 ---- a/user/wp/templates/normal.awt-gl_ES -+++ b/user/wp/templates/normal.awt-gl_ES -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-he b/user/wp/templates/normal.awt-he -index a3da00f..f1a238f 100644 ---- a/user/wp/templates/normal.awt-he -+++ b/user/wp/templates/normal.awt-he -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-he_IL b/user/wp/templates/normal.awt-he_IL -index 98d81eb..e78e16b 100644 ---- a/user/wp/templates/normal.awt-he_IL -+++ b/user/wp/templates/normal.awt-he_IL -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-hu_HU b/user/wp/templates/normal.awt-hu_HU -index d79154f..0dd6026 100644 ---- a/user/wp/templates/normal.awt-hu_HU -+++ b/user/wp/templates/normal.awt-hu_HU -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-it_IT b/user/wp/templates/normal.awt-it_IT -index a72f1d4..1121843 100644 ---- a/user/wp/templates/normal.awt-it_IT -+++ b/user/wp/templates/normal.awt-it_IT -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ja_JP b/user/wp/templates/normal.awt-ja_JP -index 4f379e1..351fdd6 100644 ---- a/user/wp/templates/normal.awt-ja_JP -+++ b/user/wp/templates/normal.awt-ja_JP -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-lt_LT b/user/wp/templates/normal.awt-lt_LT -index e9d6ec1..b66be4a 100644 ---- a/user/wp/templates/normal.awt-lt_LT -+++ b/user/wp/templates/normal.awt-lt_LT -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-nb_NO b/user/wp/templates/normal.awt-nb_NO -index 1b6398f..5cdf741 100644 ---- a/user/wp/templates/normal.awt-nb_NO -+++ b/user/wp/templates/normal.awt-nb_NO -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-nl_NL b/user/wp/templates/normal.awt-nl_NL -index 0f8b299..4be5de2 100644 ---- a/user/wp/templates/normal.awt-nl_NL -+++ b/user/wp/templates/normal.awt-nl_NL -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-nn_NO b/user/wp/templates/normal.awt-nn_NO -index 981d577..1a36ad3 100644 ---- a/user/wp/templates/normal.awt-nn_NO -+++ b/user/wp/templates/normal.awt-nn_NO -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-pl_PL b/user/wp/templates/normal.awt-pl_PL -index 0405d45..7f32223 100644 ---- a/user/wp/templates/normal.awt-pl_PL -+++ b/user/wp/templates/normal.awt-pl_PL -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ps b/user/wp/templates/normal.awt-ps -index 971e62f..e5e674f 100644 ---- a/user/wp/templates/normal.awt-ps -+++ b/user/wp/templates/normal.awt-ps -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-pt_BR b/user/wp/templates/normal.awt-pt_BR -index bdf4c09..4d85f5c 100644 ---- a/user/wp/templates/normal.awt-pt_BR -+++ b/user/wp/templates/normal.awt-pt_BR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-pt_PT b/user/wp/templates/normal.awt-pt_PT -index 7a44c3e..e1b766e 100644 ---- a/user/wp/templates/normal.awt-pt_PT -+++ b/user/wp/templates/normal.awt-pt_PT -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ru b/user/wp/templates/normal.awt-ru -index c34fd94..6e29dfd 100644 ---- a/user/wp/templates/normal.awt-ru -+++ b/user/wp/templates/normal.awt-ru -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ru_RU b/user/wp/templates/normal.awt-ru_RU -index b07198e..4f435ea 100644 ---- a/user/wp/templates/normal.awt-ru_RU -+++ b/user/wp/templates/normal.awt-ru_RU -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-sk_SK b/user/wp/templates/normal.awt-sk_SK -index d03a1a5..bb04b0e 100644 ---- a/user/wp/templates/normal.awt-sk_SK -+++ b/user/wp/templates/normal.awt-sk_SK -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-sl b/user/wp/templates/normal.awt-sl -index 2dfcf1a..e874715 100644 ---- a/user/wp/templates/normal.awt-sl -+++ b/user/wp/templates/normal.awt-sl -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-sv b/user/wp/templates/normal.awt-sv -index d0f5163..82aa982 100644 ---- a/user/wp/templates/normal.awt-sv -+++ b/user/wp/templates/normal.awt-sv -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-sv_SE b/user/wp/templates/normal.awt-sv_SE -index 932da12..55d9e8c 100644 ---- a/user/wp/templates/normal.awt-sv_SE -+++ b/user/wp/templates/normal.awt-sv_SE -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-syr b/user/wp/templates/normal.awt-syr -index 72b77ad..3bd9503 100644 ---- a/user/wp/templates/normal.awt-syr -+++ b/user/wp/templates/normal.awt-syr -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-tr b/user/wp/templates/normal.awt-tr -index 489bc0a..2497b35 100644 ---- a/user/wp/templates/normal.awt-tr -+++ b/user/wp/templates/normal.awt-tr -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-tr_TR b/user/wp/templates/normal.awt-tr_TR -index bf775c8..bfd3982 100644 ---- a/user/wp/templates/normal.awt-tr_TR -+++ b/user/wp/templates/normal.awt-tr_TR -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-uk_UA b/user/wp/templates/normal.awt-uk_UA -index 6c759ad..76cbd8c 100644 ---- a/user/wp/templates/normal.awt-uk_UA -+++ b/user/wp/templates/normal.awt-uk_UA -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-ur_PK b/user/wp/templates/normal.awt-ur_PK -index 00cc1c7..8fcaf67 100644 ---- a/user/wp/templates/normal.awt-ur_PK -+++ b/user/wp/templates/normal.awt-ur_PK -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-yi b/user/wp/templates/normal.awt-yi -index e25ac13..02ffba4 100644 ---- a/user/wp/templates/normal.awt-yi -+++ b/user/wp/templates/normal.awt-yi -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-zh_CN b/user/wp/templates/normal.awt-zh_CN -index d103911..3a949bc 100644 ---- a/user/wp/templates/normal.awt-zh_CN -+++ b/user/wp/templates/normal.awt-zh_CN -@@ -9,7 +9,7 @@ - - - -- -+ - - -
-diff --git a/user/wp/templates/normal.awt-zh_TW b/user/wp/templates/normal.awt-zh_TW -index 3570d5e..8a2cdd7 100644 ---- a/user/wp/templates/normal.awt-zh_TW -+++ b/user/wp/templates/normal.awt-zh_TW -@@ -9,7 +9,7 @@ - - - -- -+ - - -
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD deleted file mode 100644 index 6a1743f5f..000000000 --- a/libre/bitlbee-libre/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $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 - -_pkgname=bitlbee -pkgname=bitlbee-libre -pkgver=3.2.1 -pkgrel=2 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support' -url='http://www.bitlbee.org/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('gnutls' 'glib2') -makedepends=('asciidoc' 'libotr3') -optdepends=('libotr3: for OTR encryption support' - 'xinetd: to run bitlbee through xinetd') -provides=$_pkgname=$pkgver -conflicts=$_pkgname -replaces=$_pkgname -source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz" - 'xinetd' - 'bitlbee.tmpfiles') -sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5' - '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' - '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') -backup=('etc/bitlbee/bitlbee.conf' - 'etc/bitlbee/motd.txt' - 'etc/xinetd.d/bitlbee') -install=bitlbee.install - -build() { - cd "$_pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --sbindir=/usr/bin \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=gnutls \ - --strip=0 \ - --otr=plugin \ - --skype=0 - - # hacky: build against libotr3 - sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings - sed -i 's,#include.*libotr,&3,' otr.h - - make -} - -package() { - make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev} - - install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" - install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" -} diff --git a/libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch b/libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch deleted file mode 100644 index be81fec76..000000000 --- a/libre/linux-libre/nfs-check-gssd-running-before-krb5i-auth.patch +++ /dev/null @@ -1,48 +0,0 @@ -Bugzilla: N/A -Upstream-status: queued in NFS git tree (for 3.13/3.14?) - -Currently, the client will attempt to use krb5i in the SETCLIENTID call -even if rpc.gssd isn't running. When that fails, it'll then fall back to -RPC_AUTH_UNIX. This introduced a delay when mounting if rpc.gssd isn't -running, and causes warning messages to pop up in the ring buffer. - -Check to see if rpc.gssd is running before even attempting to use krb5i -auth, and just silently skip trying to do so if it isn't. In the event -that the admin is actually trying to mount with krb5*, it will still -fail at a later stage of the mount attempt. - -Signed-off-by: Jeff Layton -Signed-off-by: Trond Myklebust ---- - fs/nfs/nfs4client.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff -up linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c ---- linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c.orig 2013-09-02 16:46:10.000000000 -0400 -+++ linux-3.11.9-200.fc19.x86_64/fs/nfs/nfs4client.c 2013-11-21 10:20:27.288286000 -0500 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include "internal.h" - #include "callback.h" - #include "delegation.h" -@@ -206,7 +207,11 @@ struct nfs_client *nfs4_init_client(stru - if (clp->cl_minorversion != 0) - __set_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags); - __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags); -- error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I); -+ -+ error = -EINVAL; -+ if (gssd_running(clp->cl_net)) -+ error = nfs_create_rpc_client(clp, timeparms, -+ RPC_AUTH_GSS_KRB5I); - if (error == -EINVAL) - error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX); - if (error < 0) - -_______________________________________________ -kernel mailing list -kernel@lists.fedoraproject.org -https://admin.fedoraproject.org/mailman/listinfo/kernel diff --git a/libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch b/libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch deleted file mode 100644 index ed03f34dd..000000000 --- a/libre/linux-libre/rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch +++ /dev/null @@ -1,50 +0,0 @@ -Bugzilla: 1037793 -Upstream-status: submitted for 3.14 - -Currently, it could leak dentry references in some cases. Make sure -we clean up properly. - -Signed-off-by: Jeff Layton ---- - net/sunrpc/rpc_pipe.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 5d973b2..b185548 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -1369,6 +1369,18 @@ out: - return pipe_dentry; - } - -+static void -+rpc_gssd_dummy_depopulate(struct dentry *pipe_dentry) -+{ -+ struct dentry *clnt_dir = pipe_dentry->d_parent; -+ struct dentry *gssd_dir = clnt_dir->d_parent; -+ -+ __rpc_rmpipe(clnt_dir->d_inode, pipe_dentry); -+ __rpc_depopulate(clnt_dir, gssd_dummy_info_file, 0, 1); -+ __rpc_depopulate(gssd_dir, gssd_dummy_clnt_dir, 0, 1); -+ dput(pipe_dentry); -+} -+ - static int - rpc_fill_super(struct super_block *sb, void *data, int silent) - { -@@ -1412,7 +1424,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) - return 0; - - err_depopulate: -- dput(gssd_dentry); -+ rpc_gssd_dummy_depopulate(gssd_dentry); - blocking_notifier_call_chain(&rpc_pipefs_notifier_list, - RPC_PIPEFS_UMOUNT, - sb); --- -1.8.4.2 - --- -To unsubscribe from this list: send the line "unsubscribe linux-nfs" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch b/libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch deleted file mode 100644 index e4b1a255f..000000000 --- a/libre/linux-libre/rpc_pipe-remove-the-clntXX-dir-if-creating-the-pipe-fails.patch +++ /dev/null @@ -1,32 +0,0 @@ -Bugzilla: 1037793 -Upstream-status: submitted for 3.14 - -In the event that we create the gssd/clntXX dir, but the pipe creation -subsequently fails, then we should remove the clntXX dir before -returning. - -Signed-off-by: Jeff Layton ---- - net/sunrpc/rpc_pipe.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 5cd7ad1..0b74c61 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -1313,6 +1313,8 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) - } - - pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -+ if (IS_ERR(pipe_dentry)) -+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); - out: - dput(clnt_dentry); - dput(gssd_dentry); --- -1.8.4.2 - --- -To unsubscribe from this list: send the line "unsubscribe linux-nfs" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch b/libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch deleted file mode 100644 index dd3b5ba2f..000000000 --- a/libre/linux-libre/sunrpc-add-an-info-file-for-the-dummy-gssd-pipe.patch +++ /dev/null @@ -1,96 +0,0 @@ -Bugzilla: 1037793 -Upstream-status: submitted for 3.14 - -rpc.gssd expects to see an "info" file in each clntXX dir. Since adding -the dummy gssd pipe, users that run rpc.gssd see a lot of these messages -spamming the logs: - - rpc.gssd[508]: ERROR: can't open /var/lib/nfs/rpc_pipefs/gssd/clntXX/info: No such file or directory - rpc.gssd[508]: ERROR: failed to read service info - -Add a dummy gssd/clntXX/info file to help silence these messages. - -Signed-off-by: Jeff Layton ---- - net/sunrpc/rpc_pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 49 insertions(+), 1 deletion(-) - -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0b74c61..5d973b2 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -1275,6 +1276,44 @@ static const struct rpc_pipe_ops gssd_dummy_pipe_ops = { - .downcall = dummy_downcall, - }; - -+/* -+ * Here we present a bogus "info" file to keep rpc.gssd happy. We don't expect -+ * that it will ever use this info to handle an upcall, but rpc.gssd expects -+ * that this file will be there and have a certain format. -+ */ -+static int -+rpc_show_dummy_info(struct seq_file *m, void *v) -+{ -+ seq_printf(m, "RPC server: %s\n", utsname()->nodename); -+ seq_printf(m, "service: foo (1) version 0\n"); -+ seq_printf(m, "address: 127.0.0.1\n"); -+ seq_printf(m, "protocol: tcp\n"); -+ seq_printf(m, "port: 0\n"); -+ return 0; -+} -+ -+static int -+rpc_dummy_info_open(struct inode *inode, struct file *file) -+{ -+ return single_open(file, rpc_show_dummy_info, NULL); -+} -+ -+static const struct file_operations rpc_dummy_info_operations = { -+ .owner = THIS_MODULE, -+ .open = rpc_dummy_info_open, -+ .read = seq_read, -+ .llseek = seq_lseek, -+ .release = single_release, -+}; -+ -+static const struct rpc_filelist gssd_dummy_info_file[] = { -+ [0] = { -+ .name = "info", -+ .i_fop = &rpc_dummy_info_operations, -+ .mode = S_IFREG | S_IRUSR, -+ }, -+}; -+ - /** - * rpc_gssd_dummy_populate - create a dummy gssd pipe - * @root: root of the rpc_pipefs filesystem -@@ -1312,9 +1351,18 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) - goto out; - } - -+ ret = rpc_populate(clnt_dentry, gssd_dummy_info_file, 0, 1, NULL); -+ if (ret) { -+ __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); -+ pipe_dentry = ERR_PTR(ret); -+ goto out; -+ } -+ - pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -- if (IS_ERR(pipe_dentry)) -+ if (IS_ERR(pipe_dentry)) { -+ __rpc_depopulate(clnt_dentry, gssd_dummy_info_file, 0, 1); - __rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1); -+ } - out: - dput(clnt_dentry); - dput(gssd_dentry); --- -1.8.4.2 diff --git a/libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch b/libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch deleted file mode 100644 index 805498a70..000000000 --- a/libre/linux-libre/sunrpc-create-a-new-dummy-pipe-for-gssd-to-hold-open.patch +++ /dev/null @@ -1,233 +0,0 @@ -Bugzilla: N/A -Upstream-status: queued in NFS git tree (for 3.13/3.14?) - -rpc.gssd will naturally hold open any pipe named */clnt*/gssd that shows -up under rpc_pipefs. That behavior gives us a reliable mechanism to tell -whether it's actually running or not. - -Create a new toplevel "gssd" directory in rpc_pipefs when it's mounted. -Under that directory create another directory called "clntXX", and then -within that a pipe called "gssd". - -We'll never send an upcall along that pipe, and any downcall written to -it will just return -EINVAL. - -Signed-off-by: Jeff Layton -Signed-off-by: Trond Myklebust ---- - include/linux/sunrpc/rpc_pipe_fs.h | 3 +- - net/sunrpc/netns.h | 1 + - net/sunrpc/rpc_pipe.c | 93 ++++++++++++++++++++++++++++++++++- - net/sunrpc/sunrpc_syms.c | 8 +++- - 4 files changed, 100 insertions(+), 5 deletions(-) - -diff -up linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h ---- linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h.orig 2013-09-02 16:46:10.000000000 -0400 -+++ linux-3.11.9-200.fc19.x86_64/include/linux/sunrpc/rpc_pipe_fs.h 2013-11-21 10:11:17.893026000 -0500 -@@ -64,7 +64,8 @@ enum { - - extern struct dentry *rpc_d_lookup_sb(const struct super_block *sb, - const unsigned char *dir_name); --extern void rpc_pipefs_init_net(struct net *net); -+extern int rpc_pipefs_init_net(struct net *net); -+extern void rpc_pipefs_exit_net(struct net *net); - extern struct super_block *rpc_get_sb_net(const struct net *net); - extern void rpc_put_sb_net(const struct net *net); - -diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h ---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h.orig 2013-09-02 16:46:10.000000000 -0400 -+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/netns.h 2013-11-21 10:11:17.897029000 -0500 -@@ -14,6 +14,7 @@ struct sunrpc_net { - struct cache_detail *rsi_cache; - - struct super_block *pipefs_sb; -+ struct rpc_pipe *gssd_dummy; - struct mutex pipefs_sb_lock; - - struct list_head all_clients; -diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c ---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c.orig 2013-09-02 16:46:10.000000000 -0400 -+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/rpc_pipe.c 2013-11-21 10:11:17.903026000 -0500 -@@ -38,7 +38,7 @@ - #define NET_NAME(net) ((net == &init_net) ? " (init_net)" : "") - - static struct file_system_type rpc_pipe_fs_type; -- -+static const struct rpc_pipe_ops gssd_dummy_pipe_ops; - - static struct kmem_cache *rpc_inode_cachep __read_mostly; - -@@ -1019,6 +1019,7 @@ enum { - RPCAUTH_nfsd4_cb, - RPCAUTH_cache, - RPCAUTH_nfsd, -+ RPCAUTH_gssd, - RPCAUTH_RootEOF - }; - -@@ -1055,6 +1056,10 @@ static const struct rpc_filelist files[] - .name = "nfsd", - .mode = S_IFDIR | S_IRUGO | S_IXUGO, - }, -+ [RPCAUTH_gssd] = { -+ .name = "gssd", -+ .mode = S_IFDIR | S_IRUGO | S_IXUGO, -+ }, - }; - - /* -@@ -1068,13 +1073,25 @@ struct dentry *rpc_d_lookup_sb(const str - } - EXPORT_SYMBOL_GPL(rpc_d_lookup_sb); - --void rpc_pipefs_init_net(struct net *net) -+int rpc_pipefs_init_net(struct net *net) - { - struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - -+ sn->gssd_dummy = rpc_mkpipe_data(&gssd_dummy_pipe_ops, 0); -+ if (IS_ERR(sn->gssd_dummy)) -+ return PTR_ERR(sn->gssd_dummy); -+ - mutex_init(&sn->pipefs_sb_lock); - sn->gssd_running = 1; - sn->pipe_version = -1; -+ return 0; -+} -+ -+void rpc_pipefs_exit_net(struct net *net) -+{ -+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); -+ -+ rpc_destroy_pipe_data(sn->gssd_dummy); - } - - /* -@@ -1104,11 +1121,73 @@ void rpc_put_sb_net(const struct net *ne - } - EXPORT_SYMBOL_GPL(rpc_put_sb_net); - -+static const struct rpc_filelist gssd_dummy_clnt_dir[] = { -+ [0] = { -+ .name = "clntXX", -+ .mode = S_IFDIR | S_IRUGO | S_IXUGO, -+ }, -+}; -+ -+static ssize_t -+dummy_downcall(struct file *filp, const char __user *src, size_t len) -+{ -+ return -EINVAL; -+} -+ -+static const struct rpc_pipe_ops gssd_dummy_pipe_ops = { -+ .upcall = rpc_pipe_generic_upcall, -+ .downcall = dummy_downcall, -+}; -+ -+/** -+ * rpc_gssd_dummy_populate - create a dummy gssd pipe -+ * @root: root of the rpc_pipefs filesystem -+ * @pipe_data: pipe data created when netns is initialized -+ * -+ * Create a dummy set of directories and a pipe that gssd can hold open to -+ * indicate that it is up and running. -+ */ -+static struct dentry * -+rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) -+{ -+ int ret = 0; -+ struct dentry *gssd_dentry; -+ struct dentry *clnt_dentry = NULL; -+ struct dentry *pipe_dentry = NULL; -+ struct qstr q = QSTR_INIT(files[RPCAUTH_gssd].name, -+ strlen(files[RPCAUTH_gssd].name)); -+ -+ /* We should never get this far if "gssd" doesn't exist */ -+ gssd_dentry = d_hash_and_lookup(root, &q); -+ if (!gssd_dentry) -+ return ERR_PTR(-ENOENT); -+ -+ ret = rpc_populate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1, NULL); -+ if (ret) { -+ pipe_dentry = ERR_PTR(ret); -+ goto out; -+ } -+ -+ q.name = gssd_dummy_clnt_dir[0].name; -+ q.len = strlen(gssd_dummy_clnt_dir[0].name); -+ clnt_dentry = d_hash_and_lookup(gssd_dentry, &q); -+ if (!clnt_dentry) { -+ pipe_dentry = ERR_PTR(-ENOENT); -+ goto out; -+ } -+ -+ pipe_dentry = rpc_mkpipe_dentry(clnt_dentry, "gssd", NULL, pipe_data); -+out: -+ dput(clnt_dentry); -+ dput(gssd_dentry); -+ return pipe_dentry; -+} -+ - static int - rpc_fill_super(struct super_block *sb, void *data, int silent) - { - struct inode *inode; -- struct dentry *root; -+ struct dentry *root, *gssd_dentry; - struct net *net = data; - struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - int err; -@@ -1126,6 +1205,13 @@ rpc_fill_super(struct super_block *sb, v - return -ENOMEM; - if (rpc_populate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF, NULL)) - return -ENOMEM; -+ -+ gssd_dentry = rpc_gssd_dummy_populate(root, sn->gssd_dummy); -+ if (IS_ERR(gssd_dentry)) { -+ __rpc_depopulate(root, files, RPCAUTH_lockd, RPCAUTH_RootEOF); -+ return PTR_ERR(gssd_dentry); -+ } -+ - dprintk("RPC: sending pipefs MOUNT notification for net %p%s\n", - net, NET_NAME(net)); - mutex_lock(&sn->pipefs_sb_lock); -@@ -1140,6 +1226,7 @@ rpc_fill_super(struct super_block *sb, v - return 0; - - err_depopulate: -+ dput(gssd_dentry); - blocking_notifier_call_chain(&rpc_pipefs_notifier_list, - RPC_PIPEFS_UMOUNT, - sb); -diff -up linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c ---- linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c.orig 2013-09-02 16:46:10.000000000 -0400 -+++ linux-3.11.9-200.fc19.x86_64/net/sunrpc/sunrpc_syms.c 2013-11-21 10:11:17.908026000 -0500 -@@ -44,12 +44,17 @@ static __net_init int sunrpc_init_net(st - if (err) - goto err_unixgid; - -- rpc_pipefs_init_net(net); -+ err = rpc_pipefs_init_net(net); -+ if (err) -+ goto err_pipefs; -+ - INIT_LIST_HEAD(&sn->all_clients); - spin_lock_init(&sn->rpc_client_lock); - spin_lock_init(&sn->rpcb_clnt_lock); - return 0; - -+err_pipefs: -+ unix_gid_cache_destroy(net); - err_unixgid: - ip_map_cache_destroy(net); - err_ipmap: -@@ -60,6 +65,7 @@ err_proc: - - static __net_exit void sunrpc_exit_net(struct net *net) - { -+ rpc_pipefs_exit_net(net); - unix_gid_cache_destroy(net); - ip_map_cache_destroy(net); - rpc_proc_exit(net); - diff --git a/libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch b/libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch deleted file mode 100644 index 8cd5c0090..000000000 --- a/libre/linux-libre/sunrpc-replace-gssd_running-with-more-reliable-check.patch +++ /dev/null @@ -1,139 +0,0 @@ -Bugzilla: N/A -Upstream-status: queued in NFS git tree (for 3.13/3.14?) - -Now that we have a more reliable method to tell if gssd is running, we -can replace the sn->gssd_running flag with a function that will query to -see if it's up and running. - -There's also no need to attempt an upcall that we know will fail, so -just return -EACCES if gssd isn't running. Finally, fix the warn_gss() -message not to claim that that the upcall timed out since we don't -necesarily perform one now when gssd isn't running, and remove the -extraneous newline from the message. - -Signed-off-by: Jeff Layton -Signed-off-by: Trond Myklebust ---- - Fixed up to apply to 3.12.1 by Josh Boyer - - include/linux/sunrpc/rpc_pipe_fs.h | 2 ++ - net/sunrpc/auth_gss/auth_gss.c | 17 +++++++---------- - net/sunrpc/netns.h | 2 -- - net/sunrpc/rpc_pipe.c | 14 ++++++++++---- - 4 files changed, 19 insertions(+), 16 deletions(-) - -diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h -index 85f1342..7f490be 100644 ---- a/include/linux/sunrpc/rpc_pipe_fs.h -+++ b/include/linux/sunrpc/rpc_pipe_fs.h -@@ -131,5 +131,7 @@ extern int rpc_unlink(struct dentry *); - extern int register_rpc_pipefs(void); - extern void unregister_rpc_pipefs(void); - -+extern bool gssd_running(struct net *net); -+ - #endif - #endif -diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c -index 0846566..1ada878 100644 ---- a/net/sunrpc/auth_gss/auth_gss.c -+++ b/net/sunrpc/auth_gss/auth_gss.c -@@ -517,8 +517,7 @@ static void warn_gssd(void) - unsigned long now = jiffies; - - if (time_after(now, ratelimit)) { -- printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n" -- "Please check user daemon is running.\n"); -+ pr_warn("RPC: AUTH_GSS upcall failed. Please check user daemon is running.\n"); - ratelimit = now + 15*HZ; - } - } -@@ -581,7 +580,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) - struct rpc_pipe *pipe; - struct rpc_cred *cred = &gss_cred->gc_base; - struct gss_upcall_msg *gss_msg; -- unsigned long timeout; - DEFINE_WAIT(wait); - int err; - -@@ -589,17 +587,16 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) - __func__, from_kuid(&init_user_ns, cred->cr_uid)); - retry: - err = 0; -- /* Default timeout is 15s unless we know that gssd is not running */ -- timeout = 15 * HZ; -- if (!sn->gssd_running) -- timeout = HZ >> 2; -+ /* if gssd is down, just skip upcalling altogether */ -+ if (!gssd_running(net)) { -+ warn_gssd(); -+ return -EACCES; -+ } - gss_msg = gss_setup_upcall(gss_auth, cred); - if (PTR_ERR(gss_msg) == -EAGAIN) { - err = wait_event_interruptible_timeout(pipe_version_waitqueue, -- sn->pipe_version >= 0, timeout); -+ sn->pipe_version >= 0, 15 * HZ); - if (sn->pipe_version < 0) { -- if (err == 0) -- sn->gssd_running = 0; - warn_gssd(); - err = -EACCES; - } -diff --git a/net/sunrpc/netns.h b/net/sunrpc/netns.h -index 8a8e841..94e506f 100644 ---- a/net/sunrpc/netns.h -+++ b/net/sunrpc/netns.h -@@ -33,8 +33,6 @@ struct sunrpc_net { - int pipe_version; - atomic_t pipe_users; - struct proc_dir_entry *use_gssp_proc; -- -- unsigned int gssd_running; - }; - - extern int sunrpc_net_id; -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 40aef18..ad444f3 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -216,14 +216,11 @@ rpc_destroy_inode(struct inode *inode) - static int - rpc_pipe_open(struct inode *inode, struct file *filp) - { -- struct net *net = inode->i_sb->s_fs_info; -- struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); - struct rpc_pipe *pipe; - int first_open; - int res = -ENXIO; - - mutex_lock(&inode->i_mutex); -- sn->gssd_running = 1; - pipe = RPC_I(inode)->pipe; - if (pipe == NULL) - goto out; -@@ -1231,7 +1228,6 @@ int rpc_pipefs_init_net(struct net *net) - return PTR_ERR(sn->gssd_dummy); - - mutex_init(&sn->pipefs_sb_lock); -- sn->gssd_running = 1; - sn->pipe_version = -1; - return 0; - } -@@ -1385,6 +1381,16 @@ err_depopulate: - return err; - } - -+bool -+gssd_running(struct net *net) -+{ -+ struct sunrpc_net *sn = net_generic(net, sunrpc_net_id); -+ struct rpc_pipe *pipe = sn->gssd_dummy; -+ -+ return pipe->nreaders || pipe->nwriters; -+} -+EXPORT_SYMBOL_GPL(gssd_running); -+ - static struct dentry * - rpc_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD deleted file mode 100644 index d7d01b498..000000000 --- a/libre/spectrwm-libre/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $Id: PKGBUILD 103873 2014-01-13 00:22:03Z kkeen $ -# Maintainer: Kyle Keen -# Contributor: Christoph Zeiler - -_pkgname=spectrwm -pkgname=spectrwm-libre -pkgver=2.4.0 -pkgrel=2 -pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.spectrwm.org" -_watch="https://opensource.conformal.com/snapshots/spectrwm/" -license=('custom:ISC') -depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor') -replaces=('spectrwm' 'scrotwm') -conflicts=('spectrwm') -provides=("spectrwm=$pkgver") -makedepends=('libxt') -optdepends=('scrot: screenshots' 'xlockmore: great screenlocker' 'terminus-font: great font') -backup=(etc/spectrwm.conf) -source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \ - LICENSE \ - baraction.sh \ - swmhack_path.patch \ - spectrwm-no-preload) -md5sums=('23e32c1e292f2fc94ed88195ffe60023' - 'a67cfe51079481e5b0eab1ad371379e3' - '950d663692e1da56e0ac864c6c3ed80e' - '8914dc2bef96e3587fc9317a25c1cbe8' - '974d109ce0af39cc73936d5efd682480') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - sed -i 's|\"/usr/local/lib/libswmhack.so\"|\"libswmhack.so\"|' spectrwm.c - sed -i 's/verbose_layout = 0;/verbose_layout = 1;/' spectrwm.c - sed -i 's/# modkey = Mod1/modkey = Mod4/' spectrwm.conf - # crashes if defaults can't be found, use less massive defaults - sed -i 's/-\*-terminus-medium-\*-\*-\*-\*/-*-profont-*-*-*-*-12/' spectrwm.conf - #sed -i 's/# program[lock].*/program[lock] = slock/' spectrwm.conf - - # see spectrwm FS#403 - sed -i 's/setconfspawn("lock".*/setconfspawn("lock", "xlock", SWM_SPAWN_OPTIONAL);/' spectrwm.c - - # FS#37998, remove on 2.4.1 - patch -p1 -i "$srcdir/swmhack_path.patch" - - cd linux - make PREFIX="/usr" -} - -package() { - cd "$srcdir/$_pkgname-$pkgver/linux" - make PREFIX="/usr" DESTDIR="$pkgdir" install - install -Dm644 spectrwm.desktop "$pkgdir/usr/share/xsessions/spectrwm.desktop" - cd .. - install -Dm644 spectrwm.conf "$pkgdir/etc/spectrwm.conf" - install -Dm755 screenshot.sh "$pkgdir/usr/share/spectrwm/screenshot.sh" - mkdir -p "$pkgdir/etc/spectrwm" - cp spectrwm_*.conf "$pkgdir/etc/spectrwm/" - cd "$srcdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE" - install -Dm755 baraction.sh "$pkgdir/usr/share/spectrwm/baraction.sh" - install -Dm755 spectrwm-no-preload "$pkgdir/usr/bin/spectrwm-no-preload" - - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so.0" - #ln -s /usr/lib/libswmhack.so.0.0 "$pkgdir/usr/lib/libswmhack.so" - - # fix this for real in the makefile - rm "$pkgdir/usr/bin/scrotwm" - ln -s "/usr/bin/spectrwm" "$pkgdir/usr/bin/scrotwm" - mkdir -p "$pkgdir"/usr/share/man/{es,it,pt,ru}/man1/ - mv "$pkgdir/usr/share/man/man1/spectrwm_es.1" "$pkgdir/usr/share/man/es/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_it.1" "$pkgdir/usr/share/man/it/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_pt.1" "$pkgdir/usr/share/man/pt/man1/" - mv "$pkgdir/usr/share/man/man1/spectrwm_ru.1" "$pkgdir/usr/share/man/ru/man1/" -} diff --git a/libre/spectrwm-libre/spectrwm-no-preload b/libre/spectrwm-libre/spectrwm-no-preload deleted file mode 100644 index 12385eddb..000000000 --- a/libre/spectrwm-libre/spectrwm-no-preload +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec env -u LD_PRELOAD $@ diff --git a/libre/spectrwm-libre/swmhack_path.patch b/libre/spectrwm-libre/swmhack_path.patch deleted file mode 100644 index a4f1c3cf0..000000000 --- a/libre/spectrwm-libre/swmhack_path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/linux/Makefile b/linux/Makefile -index 73c3d37..f48a32f 100644 ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -1,16 +1,16 @@ --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g --CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\" --LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -- - PREFIX?= /usr/local - BINDIR?= $(PREFIX)/bin - LIBDIR?= $(PREFIX)/lib - MANDIR?= $(PREFIX)/share/man - --CC?= cc -- - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) - -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g -+CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\" -+LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor -+ -+CC?= cc -+ - BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) - ifneq ("${BUILDVERSION}", "") - CFLAGS+= -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\" -- cgit v1.2.3-54-g00ecf