diff --git a/.gitignore b/.gitignore index 0070639..928fd93 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ usermode-1.105.tar.xz /usermode-1.110.tar.xz /usermode-1.111.tar.xz /usermode-1.112.tar.xz +/usermode-1.112.autotoolized.tar.xz diff --git a/fsfaddr.patch b/fsfaddr.patch new file mode 100644 index 0000000..769e4b0 --- /dev/null +++ b/fsfaddr.patch @@ -0,0 +1,396 @@ +diff --git a/consolehelper-gtk.8 b/consolehelper-gtk.8 +index d964ffa..a0937cf 100644 +--- a/consolehelper-gtk.8 ++++ b/consolehelper-gtk.8 +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH CONSOLEHELPER-GTK 8 "2009-10-05" "Red Hat" + .SH NAME +diff --git a/consolehelper.8.in b/consolehelper.8.in +index d771da7..e6ad431 100644 +--- a/consolehelper.8.in ++++ b/consolehelper.8.in +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH CONSOLEHELPER 8 "18 March 1999" "Red Hat Software" + .SH NAME +diff --git a/consolehelper.c b/consolehelper.c +index d4ee6f9..064ccb3 100644 +--- a/consolehelper.c ++++ b/consolehelper.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/dummy.h b/dummy.h +index 24f8277..b6d38d3 100644 +--- a/dummy.h ++++ b/dummy.h +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + /* Just a dummy file for gettext, containing messages emmitted by various +diff --git a/gsmclient.c b/gsmclient.c +index 85a3dea..6d67e91 100644 +--- a/gsmclient.c ++++ b/gsmclient.c +@@ -17,8 +17,8 @@ + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 02111-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + */ + + #include +diff --git a/gsmclient.h b/gsmclient.h +index a4e94b0..66d97c7 100644 +--- a/gsmclient.h ++++ b/gsmclient.h +@@ -17,8 +17,8 @@ + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the +- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, +- * Boston, MA 02111-1307, USA. ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. + */ + + #ifndef GSM_CLIENT_H +diff --git a/pam-panel-icon.1 b/pam-panel-icon.1 +index f92f57a..5f891dc 100644 +--- a/pam-panel-icon.1 ++++ b/pam-panel-icon.1 +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .\" Red Hat author: Miloslav Trmač + .TH PAM-PANEL-ICON 1 "2009-10-05" "Red Hat" +diff --git a/pam-panel-icon.c b/pam-panel-icon.c +index d2e93fa..c4e038c 100644 +--- a/pam-panel-icon.c ++++ b/pam-panel-icon.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/props.c b/props.c +index 04eaeb6..3f37fd5 100644 +--- a/props.c ++++ b/props.c +@@ -15,8 +15,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- * 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "props.h" +diff --git a/props.h b/props.h +index c309450..aaa491c 100644 +--- a/props.h ++++ b/props.h +@@ -15,8 +15,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- * 02111-1307, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #ifndef MSM_PROPS_H +diff --git a/shvar.c b/shvar.c +index 114b7fc..7dd3651 100644 +--- a/shvar.c ++++ b/shvar.c +@@ -24,7 +24,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + */ + +diff --git a/shvar.h b/shvar.h +index debc1ee..81cff6f 100644 +--- a/shvar.h ++++ b/shvar.h +@@ -24,7 +24,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + */ + #ifndef _SHVAR_H +diff --git a/test-userdialog.c b/test-userdialog.c +index 4ace42e..d3dd34f 100644 +--- a/test-userdialog.c ++++ b/test-userdialog.c +@@ -14,7 +14,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/userdialogs.c b/userdialogs.c +index af44607..04f450a 100644 +--- a/userdialogs.c ++++ b/userdialogs.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + * + */ + +diff --git a/userdialogs.h b/userdialogs.h +index 44b464a..3ea2f01 100644 +--- a/userdialogs.h ++++ b/userdialogs.h +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #ifndef __USERDIALOGS_H__ +diff --git a/userhelper-messages.c b/userhelper-messages.c +index 5c73cc0..7b8e37c 100644 +--- a/userhelper-messages.c ++++ b/userhelper-messages.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/userhelper-messages.h b/userhelper-messages.h +index 69825f5..ec507d3 100644 +--- a/userhelper-messages.h ++++ b/userhelper-messages.h +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #ifndef USERHELPER_MESSAGES_H__ +diff --git a/userhelper-wrap.c b/userhelper-wrap.c +index cd35cd6..1e631f7 100644 +--- a/userhelper-wrap.c ++++ b/userhelper-wrap.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/userhelper-wrap.h b/userhelper-wrap.h +index 2fb77c0..e4fea41 100644 +--- a/userhelper-wrap.h ++++ b/userhelper-wrap.h +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #ifndef __USERHELPER_WRAP_H__ +diff --git a/userhelper.8.in b/userhelper.8.in +index 4e7aff1..ce90528 100644 +--- a/userhelper.8.in ++++ b/userhelper.8.in +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH USERHELPER 8 "January 8 2008" "Red Hat, Inc." + .SH NAME +diff --git a/userhelper.c b/userhelper.c +index 287aa4d..fa5395d 100644 +--- a/userhelper.c ++++ b/userhelper.c +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" +diff --git a/userhelper.h b/userhelper.h +index 50e6ed9..32c29d6 100644 +--- a/userhelper.h ++++ b/userhelper.h +@@ -13,7 +13,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #ifndef __USERHELPER_H__ +diff --git a/userinfo.1 b/userinfo.1 +index 8701bda..292aa4b 100644 +--- a/userinfo.1 ++++ b/userinfo.1 +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH USERINFO 1 "6 October 1997" "Red Hat Software" + .SH NAME +diff --git a/userinfo.c b/userinfo.c +index 5139b13..4c0ea9b 100644 +--- a/userinfo.c ++++ b/userinfo.c +@@ -14,7 +14,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + /* Things to remember... +diff --git a/usermount.1 b/usermount.1 +index eb864c8..1af6122 100644 +--- a/usermount.1 ++++ b/usermount.1 +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH USERMOUNT 1 "March 13 2007" "Red Hat" + .SH NAME +diff --git a/usermount.c b/usermount.c +index 5875c09..1fc627b 100644 +--- a/usermount.c ++++ b/usermount.c +@@ -14,7 +14,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + /* TODO notes. +diff --git a/userpasswd.1 b/userpasswd.1 +index 3f11f7a..6e2ab14 100644 +--- a/userpasswd.1 ++++ b/userpasswd.1 +@@ -12,7 +12,8 @@ + .\" + .\" You should have received a copy of the GNU General Public License + .\" along with this program; if not, write to the Free Software +-.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++.\" MA 02110-1301, USA. + .\" + .TH USERPASSWD 1 "17 October 1997" "Red Hat Software" + .SH NAME +diff --git a/userpasswd.c b/userpasswd.c +index 42c6705..fad128f 100644 +--- a/userpasswd.c ++++ b/userpasswd.c +@@ -14,7 +14,8 @@ + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. + */ + + #include "config.h" diff --git a/sources b/sources index dd92272..8e2e9ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (usermode-1.112.tar.xz) = 2c975eea65c74b0b05d9f2faf767862e55ace042b3c6bf072a8cabb724841c3c1e7f55be8afcff459ba599b2077d96c44e11dac4d3cc051cd39ab1e9e3b6451d +SHA512 (usermode-1.112.autotoolized.tar.xz) = b1e6fc846b074d99409eb57347eabc2816bbba075af10bc14f396e09d0b0f89bde7b80546a647ed6e30e958a449138ec04708896c9406359504750bcd05ed819 diff --git a/sysmacros.patch b/sysmacros.patch new file mode 100644 index 0000000..4ba8859 --- /dev/null +++ b/sysmacros.patch @@ -0,0 +1,12 @@ +diff --git a/usermount.c b/usermount.c +index 3aafadd..5875c09 100644 +--- a/usermount.c ++++ b/usermount.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/translations.patch b/translations.patch deleted file mode 100644 index b5365bf..0000000 --- a/translations.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format - diff --git a/usermode.spec b/usermode.spec index a94cf53..7a69c11 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,18 @@ Summary: Tools for certain user account management tasks Name: usermode Version: 1.112 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ -Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz +Source: https://releases.pagure.org/usermode/usermode-%{version}.autotoolized.tar.xz Source1: config-util -# Corrects missing `\n' in `po/tr.po' -Patch0: translations.patch +# Backport of c5a0bfd174e4a88fcd49fe7a130b37b6779c1a18 +# - inclusion of from is now deprecated +Patch0: sysmacros.patch +# Backport of da01d6325a1a9eb8154abb6a4590c610e8db8ec4 +# - bad FSF address fix +Patch1: fsfaddr.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: gcc @@ -42,7 +46,7 @@ graphical tools for certain account management tasks. %prep %setup -q %patch0 -p1 -./autogen.sh +%patch1 -p1 %build %configure --with-selinux @@ -96,6 +100,12 @@ done %{_datadir}/applications/* %changelog +* Tue Aug 07 2018 Jiri Kucera - 1.112-3 +- Dropped need to run autotools +- must be now included manually + Resolves #1606624 +- Fixed bad FSF address + * Sat Jul 14 2018 Fedora Release Engineering - 1.112-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild