- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).

diff --cc Lib/test/test_fcntl.py
index 9dd887ab1a5f4d00f9d2c261c849f5389610fc9e,e2a1b374cddc44e66bba227ecff3665ebf72ef39..b64eba2cade05797032732165dbce9424b8fd869
--- 1/Lib/test/test_fcntl.py
--- 2/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@@ -32,8 -35,12 +32,10 @@@ def get_lockdata()
              pid_t = 'l'
          lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0,
                                 fcntl.F_WRLCK, 0)
+     elif sys.platform.startswith('gnukfreebsd'):
+         lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
      elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
          lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
 -    elif sys.platform in ['os2emx']:
 -        lockdata = None
      else:
          lockdata = struct.pack('hh'+start_len+'hh', fcntl.F_WRLCK, 0, 0, 0, 0, 0)
      if lockdata:

diff --cc Misc/NEWS
index f066212c50b9d4e7889ee68e0365d9933d288623,27f97b07678dcfa667d12110a28d2b4ed69ef095..edf95f5948b4b507d45c0a5c504dcdd4aad6c890
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -566,72 -446,58 +566,74 @@@ Librar
  
  - Issue #17666: Fix reading gzip files with an extra field.
  
 +- Issue #16475: Support object instancing, recursion and interned strings
 +  in marshal
 +
  - Issue #17502: Process DEFAULT values in mock side_effect that returns iterator.
 -  Patch by Michael Foord.
  
 -- Issue #17572: Avoid chained exceptions while passing bad directives to
 -  time.strptime().  Initial patch by Claudiu Popa.
 +- Issue #16795: On the ast.arguments object, unify vararg with varargannotation
 +  and kwarg and kwargannotation. Change the column offset of ast.Attribute to be
 +  at the attribute name.
  
 -- Issue #17435: threading.Timer's __init__ method no longer uses mutable
 -  default values for the args and kwargs parameters.
 +- Issue #17434: Properly raise a SyntaxError when a string occurs between future
 +  imports.
  
 -- Issue #17526: fix an IndexError raised while passing code without filename to
 -  inspect.findsource().  Initial patch by Tyler Doyle.
 +- Issue #17117: Import and @importlib.util.set_loader now set __loader__ when
 +  it has a value of None or the attribute doesn't exist.
  
 -- Issue #16550: Update the opcode descriptions of pickletools to use unsigned
 -  integers where appropriate.  Initial patch by Serhiy Storchaka.
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
  
 -IDLE
 -----
 +- Issue #18080: When building a C extension module on OS X, if the compiler
 +  is overriden with the CC environment variable, use the new compiler as
 +  the default for linking if LDSHARED is not also overriden.  This restores
 +  Distutils behavior introduced in 3.2.3 and inadvertently dropped in 3.3.0.
  
 -- Issue #17838: Allow sys.stdin to be reassigned.
 +- Issue #18113: Fixed a refcount leak in the curses.panel module's
 +  set_userptr() method.  Reported by Atsuo Ishimoto.
  
 -- Issue #13495: Avoid loading the color delegator twice in IDLE.
 +- Implement PEP 443 "Single-dispatch generic functions".
  
 -- Issue #17798: Allow IDLE to edit new files when specified on command line.
 +- Implement PEP 435 "Adding an Enum type to the Python standard library".
  
 -- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
 +Tests
 +-----
  
 -- Issue #17585: Fixed IDLE regression. Now closes when using exit() or quit().
++- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
+ 
 -- Issue #17657: Show full Tk version in IDLE's about dialog.
 -  Patch by Todd Rovito.
 +- Issue #18396: Fix spurious test failure in test_signal on Windows when
 +  faulthandler is enabled (Patch by Jeremy Kloth)
  
 -- Issue #17613: Prevent traceback when removing syntax colorizer in IDLE.
 +- Issue #17046: Fix broken test_executable_without_cwd in test_subprocess.
  
 -- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.
 +- Issue #15415: Add new temp_dir() and change_cwd() context managers to
 +  test.support, and refactor temp_cwd() to use them.  Patch by Chris Jerdonek.
  
 -- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
 +- Issue #15494: test.support is now a package rather than a module (Initial
 +  patch by Indra Talip)
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 +- Issue #17944: test_zipfile now discoverable and uses subclassing to
 +  generate tests for different compression types.  Fixed a bug with skipping
 +  some tests due to use of exhausted iterators.
  
 -- Issue #14254: IDLE now handles readline correctly across shell restarts.
 +- Issue #18266: test_largefile now works with unittest test discovery and
 +  supports running only selected tests.  Patch by Zachary Ware.
  
 -- Issue #17614: IDLE no longer raises exception when quickly closing a file.
 +- Issue #17767: test_locale now works with unittest test discovery.
 +  Original patch by Zachary Ware.
  
 -- Issue #6698: IDLE now opens just an editor window when configured to do so.
 +- Issue #18375: Assume --randomize when --randseed is used for running the
 +  testsuite.
  
 -- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
 -  raises an exception.
 +- Issue #11185: Fix test_wait4 under AIX.  Patch by Sébastien Sablé.
  
 -- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
 +- Issue #18207: Fix test_ssl for some versions of OpenSSL that ignore seconds
 +  in ASN1_TIME fields.
  
 -Tests
 ------
 +- Issue #18094: test_uuid no more reports skipped tests as passed.
 +
 +- Issue #17992: Add timeouts to asyncore and asynchat tests so that they won't
 +  accidentally hang.
  
  - Issue #17833: Fix test_gdb failures seen on machines where debug symbols
    for glibc are available (seen on PPC64 Linux).