Bug 239942 - x11/xdm: does not build after update to 1.1.12
Summary: x11/xdm: does not build after update to 1.1.12
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-08-18 16:07 UTC by Martin Birgmeier
Modified: 2019-08-18 17:05 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (x11)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Martin Birgmeier 2019-08-18 16:07:19 UTC
Scenario:
- Updating ports using portmaster

Result:
- Build fails
- Snippet of build log:

===>  Patching for xdm-1.1.12
===>  Applying FreeBSD patches for xdm-1.1.12
1 out of 1 hunks failed--saving rejects to config/Makefile.in.rej
=> FreeBSD patch patch-config-Makefile.in failed to apply cleanly.
*** Error code 1

Stop.
make[1]: stopped in /a/SRC/FreeBSD-ports/head/x11/xdm
*** Error code 1

Stop.
make: stopped in /a/SRC/FreeBSD-ports/head/x11/xdm

===>>> make build failed for x11/xdm

-- Martin
Comment 1 Niclas Zeising freebsd_committer 2019-08-18 16:10:46 UTC
Probably fallout from moving stuff from git to SVN.  I'll fix it ASAP.
Comment 2 commit-hook freebsd_committer 2019-08-18 16:21:22 UTC
A commit references this bug:

Author: zeising
Date: Sun Aug 18 16:20:23 UTC 2019
New revision: 509225
URL: https://svnweb.freebsd.org/changeset/ports/509225

Log:
  x11/xdm: Remove patch file

  Remove patch file, this should have been done in r509218, but was missed
  when moving from git to SVN.

  PR:		239942
  Reported by:	Martin Birgmeier
  MFH:		2019Q3
  X-MFH-with:	509218
  Sponsored by:	B3 Init

Changes:
  head/x11/xdm/files/patch-config-Makefile.in
Comment 3 Niclas Zeising freebsd_committer 2019-08-18 16:22:14 UTC
Fixed, sorry about that.
Comment 4 Martin Birgmeier 2019-08-18 16:25:10 UTC
Thanks for the quick work!

-- Martin
Comment 5 commit-hook freebsd_committer 2019-08-18 17:05:28 UTC
A commit references this bug:

Author: zeising
Date: Sun Aug 18 17:04:43 UTC 2019
New revision: 509229
URL: https://svnweb.freebsd.org/changeset/ports/509229

Log:
  MFH: r509218 r509225

  x11/xdm: Update to 1.1.12

  Update x11/xdm to 1.1.12.
  This is a big release, incorporating over 7 years worth of changes.

  Changelog:
  https://lists.x.org/archives/xorg-announce/2019-March/002959.html

  Obtained from:	FreeBSD Graphics Team development repo
  		https://github.com/FreeBSDDesktop/freebsd-ports/tree/feature/xorglibs
  Seucrity:	CVE-2013-2179
  Sponsored by:	B3 Init

  x11/xdm: Remove patch file

  Remove patch file, this should have been done in r509218, but was missed
  when moving from git to SVN.

  PR:		239942
  Reported by:	Martin Birgmeier
  X-MFH-with:	509218
  Sponsored by:	B3 Init

  Approved by:	ports-secteam (joneum)

Changes:
_U  branches/2019Q3/
  branches/2019Q3/x11/xdm/Makefile
  branches/2019Q3/x11/xdm/distinfo
  branches/2019Q3/x11/xdm/files/patch-config-Makefile.in
  branches/2019Q3/x11/xdm/files/patch-config-Xresources.cpp
  branches/2019Q3/x11/xdm/files/patch-config_Xresources.in
  branches/2019Q3/x11/xdm/files/patch-config_xdm-config.cpp
  branches/2019Q3/x11/xdm/files/patch-config_xdm-config.in
  branches/2019Q3/x11/xdm/files/patch-xdm_session.c
  branches/2019Q3/x11/xdm/pkg-plist